@wu529778790/open-im 1.11.2-beta.0 → 1.11.2-beta.2

package/dist/config.js

@@ -8,7 +8,7 @@ import { accessSync, constants } from 'node:fs';
 import { execFileSync } from 'node:child_process';
 import { join, isAbsolute } from 'node:path';
 import { createLogger } from './logger.js';
-import { APP_HOME, DEFAULT_TELEMETRY_INGEST_URL, DEFAULT_TELEMETRY_INGEST_TOKEN, } from './constants.js';
+import { APP_HOME, } from './constants.js';
 const log = createLogger('config');
 /** 分渠道 AI 工具：未配置时使用 AI_COMMAND / 旧版根级 aiCommand / 默认 claude */
 function resolveFilePlatformAi(file, platform) {
@@ -401,48 +401,8 @@ export function loadConfig() {
     else {
         telemetryEnabled = true;
     }
-    let telemetryUrl;
-    const telemetryUrlRaw = process.env.OPEN_IM_TELEMETRY_URL ?? file.telemetry?.url;
-    if (telemetryUrlRaw && typeof telemetryUrlRaw === 'string' && telemetryUrlRaw.trim()) {
-        try {
-            const u = new URL(telemetryUrlRaw.trim());
-            if (u.protocol !== 'https:') {
-                log.warn('OPEN_IM_TELEMETRY_URL / telemetry.url 必须为 https，已忽略上传地址');
-            }
-            else {
-                telemetryUrl = u.href;
-            }
-        }
-        catch {
-            log.warn('无效的 OPEN_IM_TELEMETRY_URL / telemetry.url，已忽略上传地址');
-        }
-    }
-    if (!telemetryUrl && telemetryEnabled && DEFAULT_TELEMETRY_INGEST_URL.trim()) {
-        try {
-            const u = new URL(DEFAULT_TELEMETRY_INGEST_URL.trim());
-            if (u.protocol === 'https:') {
-                telemetryUrl = u.href;
-            }
-        }
-        catch {
-            /* ignore */
-        }
-    }
-    let telemetryToken;
-    if (process.env.OPEN_IM_TELEMETRY_TOKEN !== undefined) {
-        const t = process.env.OPEN_IM_TELEMETRY_TOKEN.trim();
-        telemetryToken = t.length > 0 ? t : undefined;
-    }
-    else if (file.telemetry?.token !== undefined) {
-        const t = String(file.telemetry.token).trim();
-        telemetryToken = t.length > 0 ? t : undefined;
-    }
-    else {
-        telemetryToken = DEFAULT_TELEMETRY_INGEST_TOKEN.trim() || undefined;
-    }
-    if (telemetryEnabled && !telemetryUrl) {
-        log.warn('遥测已开启但未配置有效的 HTTPS 采集 URL：仅写入本地 events-*.jsonl；可设置 OPEN_IM_TELEMETRY_URL 或在 constants 中配置 DEFAULT_TELEMETRY_INGEST_URL。');
-    }
+    // Telemetry: local event logging only (no cloud upload)
+    // Users can disable via OPEN_IM_TELEMETRY=false or telemetry.enabled=false
     const platforms = {
         telegram: telegramEnabled
             ? {
@@ -576,8 +536,6 @@ export function loadConfig() {
         logLevel,
         telemetry: {
             enabled: telemetryEnabled,
-            url: telemetryUrl,
-            token: telemetryToken,
         },
         platforms,
     };

package/dist/constants.d.ts

@@ -1,14 +1,4 @@
 export declare const APP_HOME: string;
-/**
- * 未设置 `OPEN_IM_TELEMETRY_URL` / `telemetry.url` 时使用的默认采集端（HTTPS）。
- * 工具发行方可写死自有域名；留空字符串则仅在上游显式配置 URL 时上传。
- */
-export declare const DEFAULT_TELEMETRY_INGEST_URL = "https://open-im.shenzjd.com/v1/ingest";
-/**
- * 未设置 `OPEN_IM_TELEMETRY_TOKEN` / `telemetry.token` 时使用的默认 Bearer。
- * 须与 Cloudflare Worker 的 `wrangler secret put TELEMETRY_INGEST_TOKEN` 值完全一致。
- */
-export declare const DEFAULT_TELEMETRY_INGEST_TOKEN = "610457d55274f20f2d031d38cdfd86c8498016e75160f60cdbce0dab93a78240";
 /** 优雅关闭 HTTP 端口（stop 命令通过此端口触发 shutdown） */
 export declare const SHUTDOWN_PORT = 39281;
 /** 本地 Web 配置 API 固定端口（完整 UI 由 web/dist 随包提供，见 getPublicWebDashboardUrl） */

package/dist/constants.js

@@ -1,16 +1,6 @@
 import { join } from "node:path";
 import { homedir, tmpdir } from "node:os";
 export const APP_HOME = join(homedir(), ".open-im");
-/**
- * 未设置 `OPEN_IM_TELEMETRY_URL` / `telemetry.url` 时使用的默认采集端（HTTPS）。
- * 工具发行方可写死自有域名；留空字符串则仅在上游显式配置 URL 时上传。
- */
-export const DEFAULT_TELEMETRY_INGEST_URL = "https://open-im.shenzjd.com/v1/ingest";
-/**
- * 未设置 `OPEN_IM_TELEMETRY_TOKEN` / `telemetry.token` 时使用的默认 Bearer。
- * 须与 Cloudflare Worker 的 `wrangler secret put TELEMETRY_INGEST_TOKEN` 值完全一致。
- */
-export const DEFAULT_TELEMETRY_INGEST_TOKEN = "610457d55274f20f2d031d38cdfd86c8498016e75160f60cdbce0dab93a78240";
 /** 优雅关闭 HTTP 端口（stop 命令通过此端口触发 shutdown） */
 export const SHUTDOWN_PORT = 39281;
 /** 本地 Web 配置 API 固定端口（完整 UI 由 web/dist 随包提供，见 getPublicWebDashboardUrl） */

package/dist/index.js

@@ -183,7 +183,7 @@ export async function main() {
             logLevel: config.logLevel,
             telemetry: config.telemetry,
         });
-        initSentry();
+        initSentry(config.telemetry.enabled);
         applyOpenImGitCoauthorToProcessEnv();
     }
     catch (err) {

package/dist/logger.js

@@ -4,7 +4,6 @@ import { finished } from 'node:stream/promises';
 import { sanitize } from './sanitize.js';
 import { APP_HOME } from './constants.js';
 import { sanitizeTelemetryData } from './telemetry/telemetry-sanitize.js';
-import { enqueueTelemetryLine, getTelemetryUploadStats, initTelemetryUpload, shutdownTelemetryUpload, } from './telemetry/telemetry-upload.js';
 const DEFAULT_LOG_DIR = join(APP_HOME, 'logs');
 const MAX_LOG_FILES = 10;
 const LOG_LEVELS = { DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3 };
@@ -14,9 +13,6 @@ let logStream;
 let eventsStream;
 let auditStream;
 let telemetryEnabled = false;
-let telemetryStatsTimer = null;
-let lastTelemetryStatsSignature = '';
-const TELEMETRY_STATS_INTERVAL_MS = 5 * 60_000;
 function pad(n) {
     return String(n).padStart(2, '0');
 }
@@ -85,11 +81,6 @@ export function initLogger(dirOrOpts, level, telemetry) {
     }
     auditStream = createWriteStream(join(logDir, 'audit.log'), { flags: 'a' });
     telemetryEnabled = !!tel?.enabled;
-    if (telemetryStatsTimer) {
-        clearInterval(telemetryStatsTimer);
-        telemetryStatsTimer = null;
-    }
-    lastTelemetryStatsSignature = '';
     if (eventsStream) {
         eventsStream.end();
         eventsStream = undefined;
@@ -97,29 +88,8 @@ export function initLogger(dirOrOpts, level, telemetry) {
     if (telemetryEnabled) {
         rotateOldJsonl();
         eventsStream = createWriteStream(join(logDir, getEventsFileName()), { flags: 'a' });
-        initTelemetryUpload({
-            enabled: true,
-            url: tel?.url,
-            token: tel?.token,
-        });
-        telemetryStatsTimer = setInterval(() => {
-            emitTelemetryUploadStats(false);
-        }, TELEMETRY_STATS_INTERVAL_MS);
-    }
-    else {
-        initTelemetryUpload({ enabled: false });
     }
 }
-function emitTelemetryUploadStats(force) {
-    if (!telemetryEnabled)
-        return;
-    const stats = getTelemetryUploadStats();
-    const signature = JSON.stringify(stats);
-    if (!force && signature === lastTelemetryStatsSignature)
-        return;
-    lastTelemetryStatsSignature = signature;
-    emitStructuredEvent('Telemetry', 'telemetry.upload.stats', stats);
-}
 function write(level, tag, msg, ...args) {
     if (LOG_LEVELS[level] < minLevel)
         return;
@@ -170,15 +140,9 @@ export function emitStructuredEvent(tag, event, data, level = 'INFO', msg = '')
     };
     const line = `${JSON.stringify(payload)}\n`;
     eventsStream?.write(line);
-    enqueueTelemetryLine(line);
 }
 export async function shutdownLoggerTelemetry() {
-    emitTelemetryUploadStats(true);
-    if (telemetryStatsTimer) {
-        clearInterval(telemetryStatsTimer);
-        telemetryStatsTimer = null;
-    }
-    await shutdownTelemetryUpload();
+    // Local event logging only — no upload to clean up
 }
 export async function closeLogger() {
     if (eventsStream) {

package/dist/shared/sentry.d.ts

@@ -1,21 +1,20 @@
 /**
  * Sentry 错误追踪集成
  *
- * 仅捕获错误，不开启性能监控（免费版 5K errors/月 够用）。
- * 通过 OPEN_IM_SENTRY_DSN 环境变量启用。
+ * - 默认启用，收集错误用于改进产品质量
+ * - 用户可通过 OPEN_IM_TELEMETRY=false 或 config.json opt-out
+ * - 只收集错误类型和堆栈，不收集用户数据（PII）
  */
 /**
- * 初始化 Sentry。无 DSN 则静默跳过。
+ * 初始化 Sentry
+ * - 默认启用（收集错误改进产品）
+ * - 用户可通过 OPEN_IM_TELEMETRY=false 或 telemetry.enabled=false opt-out
  */
-export declare function initSentry(): void;
+export declare function initSentry(telemetryEnabled?: boolean): void;
 /**
- * 上报错误到 Sentry
+ * 上报错误到 Sentry（自动清理 PII）
  */
 export declare function captureError(error: Error | unknown, context?: Record<string, unknown>): void;
-/**
- * 添加面包屑（错误发生前的上下文）
- */
-export declare function addBreadcrumb(category: string, message: string, data?: Record<string, unknown>): void;
 /**
  * 刷新并关闭 Sentry（优雅关闭时调用）
  */

package/dist/shared/sentry.js

@@ -1,38 +1,81 @@
 /**
  * Sentry 错误追踪集成
  *
- * 仅捕获错误，不开启性能监控（免费版 5K errors/月 够用）。
- * 通过 OPEN_IM_SENTRY_DSN 环境变量启用。
+ * - 默认启用，收集错误用于改进产品质量
+ * - 用户可通过 OPEN_IM_TELEMETRY=false 或 config.json opt-out
+ * - 只收集错误类型和堆栈，不收集用户数据（PII）
  */
 import * as Sentry from '@sentry/node';
 import { createLogger } from '../logger.js';
 const log = createLogger('Sentry');
+// 开发者的 Sentry DSN（所有 open-im 实例共享）
+const DEFAULT_DSN = 'https://cc5ad094c1229b2a2ff23ab54b0fd807@o4508612762861568.ingest.us.sentry.io/4511583989727232';
 let initialized = false;
 /**
- * 初始化 Sentry。无 DSN 则静默跳过。
+ * 清理 PII（用户数据）
+ * 只保留错误信息，移除敏感内容
  */
-export function initSentry() {
-    const dsn = process.env.OPEN_IM_SENTRY_DSN;
-    if (!dsn) {
-        log.debug('Sentry disabled (no OPEN_IM_SENTRY_DSN)');
+function sanitizeContext(context) {
+    const clean = {};
+    for (const [key, value] of Object.entries(context)) {
+        // 跳过敏感字段
+        if (/token|secret|password|key|api_key|apikey|auth/i.test(key))
+            continue;
+        // 跳过用户 ID（只保留平台信息）
+        if (/userId|user_id|userKey|user_key/i.test(key)) {
+            clean[key] = '[redacted]';
+            continue;
+        }
+        // 截断长字符串
+        if (typeof value === 'string' && value.length > 200) {
+            clean[key] = value.substring(0, 200) + '...';
+        }
+        else {
+            clean[key] = value;
+        }
+    }
+    return clean;
+}
+/**
+ * 初始化 Sentry
+ * - 默认启用（收集错误改进产品）
+ * - 用户可通过 OPEN_IM_TELEMETRY=false 或 telemetry.enabled=false opt-out
+ */
+export function initSentry(telemetryEnabled = true) {
+    // 检查 opt-out
+    const envOptOut = process.env.OPEN_IM_TELEMETRY?.trim().toLowerCase();
+    if (envOptOut === 'false' || envOptOut === '0' || envOptOut === 'no' || !telemetryEnabled) {
+        log.debug('Sentry disabled (user opt-out)');
         return;
     }
+    // 优先使用用户自定义 DSN，否则用默认 DSN
+    const dsn = process.env.OPEN_IM_SENTRY_DSN || DEFAULT_DSN;
     try {
         Sentry.init({
             dsn,
-            // 只捕获 error 级别，不捕获 warning/info
+            // 只捕获 error 级别
             beforeSend(event) {
                 if (event.level !== 'error' && event.level !== 'fatal')
                     return null;
+                // 清理 PII
+                if (event.extra) {
+                    event.extra = sanitizeContext(event.extra);
+                }
+                if (event.contexts) {
+                    for (const [key, value] of Object.entries(event.contexts)) {
+                        if (typeof value === 'object' && value !== null) {
+                            event.contexts[key] = sanitizeContext(value);
+                        }
+                    }
+                }
                 return event;
             },
             // 不开启 performance monitoring
             tracesSampleRate: 0,
             // 环境标识
             environment: process.env.NODE_ENV ?? 'production',
-            // 附加面包屑（错误发生前的日志）
+            // 附加面包屑
             beforeBreadcrumb(breadcrumb) {
-                // 只保留关键 breadcrumb
                 if (breadcrumb.category === 'console' || breadcrumb.category === 'http') {
                     return breadcrumb;
                 }
@@ -40,14 +83,14 @@ export function initSentry() {
             },
         });
         initialized = true;
-        log.info('Sentry initialized');
+        log.info('Sentry initialized (error tracking enabled)');
     }
     catch (err) {
         log.warn('Sentry init failed:', err);
     }
 }
 /**
- * 上报错误到 Sentry
+ * 上报错误到 Sentry（自动清理 PII）
  */
 export function captureError(error, context) {
     if (!initialized)
@@ -55,7 +98,7 @@ export function captureError(error, context) {
     try {
         Sentry.withScope((scope) => {
             if (context) {
-                scope.setExtras(context);
+                scope.setExtras(sanitizeContext(context));
             }
             if (error instanceof Error) {
                 scope.setTag('error.name', error.name);
@@ -68,24 +111,6 @@ export function captureError(error, context) {
         // Sentry 本身不应影响业务
     }
 }
-/**
- * 添加面包屑（错误发生前的上下文）
- */
-export function addBreadcrumb(category, message, data) {
-    if (!initialized)
-        return;
-    try {
-        Sentry.addBreadcrumb({
-            category,
-            message: message.substring(0, 200),
-            data,
-            level: 'info',
-        });
-    }
-    catch {
-        // ignore
-    }
-}
 /**
  * 刷新并关闭 Sentry（优雅关闭时调用）
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.11.2-beta.0",
+  "version": "1.11.2-beta.2",
   "description": "Your AI coding assistant, in every chat app. Multi-platform IM bridge for Claude Code, Codex, and CodeBuddy.",
   "type": "module",
   "main": "dist/index.js",

package/dist/telemetry/telemetry-upload.d.ts

@@ -1,21 +0,0 @@
-interface TelemetryUploadStats {
-    postedBatches: number;
-    postedLines: number;
-    retryableFailures: number;
-    dropped4xxBatches: number;
-    dropped4xxLines: number;
-    networkFailures: number;
-}
-export declare function initTelemetryUpload(opts: {
-    enabled: boolean;
-    url?: string;
-    token?: string;
-}): void;
-/**
- * 单行 NDJSON（已含 \\n）。
- * 满 BATCH_MAX_LINES 立即上传；否则自「当前积压周期」起至少间隔 MIN_PARTIAL_FLUSH_INTERVAL_MS 再上传。
- */
-export declare function enqueueTelemetryLine(line: string): void;
-export declare function shutdownTelemetryUpload(): Promise<void>;
-export declare function getTelemetryUploadStats(): Readonly<TelemetryUploadStats>;
-export {};

package/dist/telemetry/telemetry-upload.js

@@ -1,233 +0,0 @@
-/**
- * 遥测 NDJSON 上传：
- * - 单次 POST 最多 BATCH_MAX_LINES 条（控制 body 大小）；
- * - 事件稀疏时按 MIN_PARTIAL_FLUSH_INTERVAL_MS 合并上报，降低时间维度上的请求频率；
- * - 积压达到 BATCH_MAX_LINES 时仍立即上传（突发流量）。
- */
-const BATCH_MAX_LINES = 100;
-/** 稀疏流量：队列未满批时，最早在「首条入队」后经过该间隔才上传（避免短间隔反复 POST） */
-const MIN_PARTIAL_FLUSH_INTERVAL_MS = 60_000;
-const MAX_QUEUE = 8000;
-const MAX_BACKOFF_MS = 120_000;
-const INITIAL_BACKOFF_MS = 1000;
-let queue = [];
-let idleTimer = null;
-let backoffTimer = null;
-let backoffMs = INITIAL_BACKOFF_MS;
-let uploadEnabled = false;
-let endpoint;
-let bearer;
-let flushing = false;
-const stats = {
-    postedBatches: 0,
-    postedLines: 0,
-    retryableFailures: 0,
-    dropped4xxBatches: 0,
-    dropped4xxLines: 0,
-    networkFailures: 0,
-};
-function resetStats() {
-    stats.postedBatches = 0;
-    stats.postedLines = 0;
-    stats.retryableFailures = 0;
-    stats.dropped4xxBatches = 0;
-    stats.dropped4xxLines = 0;
-    stats.networkFailures = 0;
-}
-function clearIdleTimer() {
-    if (idleTimer) {
-        clearTimeout(idleTimer);
-        idleTimer = null;
-    }
-}
-function clearBackoffTimer() {
-    if (backoffTimer) {
-        clearTimeout(backoffTimer);
-        backoffTimer = null;
-    }
-}
-function schedulePartialFlush() {
-    if (!uploadEnabled || !endpoint || idleTimer || flushing || backoffTimer)
-        return;
-    idleTimer = setTimeout(() => {
-        idleTimer = null;
-        void flushPipeline().catch(() => {
-            /* 静默；退避重试由 flushPipeline/backoff 处理 */
-        });
-    }, MIN_PARTIAL_FLUSH_INTERVAL_MS);
-}
-async function postBatch(lines) {
-    if (!endpoint || lines.length === 0)
-        return true;
-    const body = lines.join('');
-    const headers = {
-        'content-type': 'application/x-ndjson',
-        accept: 'application/json',
-    };
-    if (bearer)
-        headers.authorization = `Bearer ${bearer}`;
-    try {
-        const res = await fetch(endpoint, { method: 'POST', headers, body });
-        try {
-            await res.text();
-        }
-        catch {
-            /* ignore body read errors */
-        }
-        if (res.ok) {
-            stats.postedBatches += 1;
-            stats.postedLines += lines.length;
-            return true;
-        }
-        // 4xx（除 408/429）通常是请求本身不可恢复（鉴权/格式错误），不应无限重试。
-        if (res.status >= 400 && res.status < 500 && res.status !== 408 && res.status !== 429) {
-            stats.dropped4xxBatches += 1;
-            stats.dropped4xxLines += lines.length;
-            return true;
-        }
-        stats.retryableFailures += 1;
-        return false;
-    }
-    catch {
-        stats.networkFailures += 1;
-        return false;
-    }
-}
-async function flushPipeline() {
-    if (!uploadEnabled || !endpoint || flushing)
-        return;
-    if (queue.length === 0)
-        return;
-    flushing = true;
-    try {
-        while (uploadEnabled && endpoint && queue.length > 0) {
-            const batch = queue.splice(0, BATCH_MAX_LINES);
-            try {
-                const ok = await postBatch(batch);
-                if (ok) {
-                    backoffMs = INITIAL_BACKOFF_MS;
-                    clearBackoffTimer();
-                }
-                else {
-                    queue.unshift(...batch);
-                    await backoffThenRetry();
-                    break;
-                }
-            }
-            catch {
-                queue.unshift(...batch);
-                await backoffThenRetry();
-                break;
-            }
-        }
-    }
-    catch {
-        /* 静默：上传失败不得向外抛，避免 unhandledRejection */
-    }
-    finally {
-        flushing = false;
-    }
-}
-function backoffThenRetry() {
-    return new Promise((resolve) => {
-        clearBackoffTimer();
-        backoffTimer = setTimeout(() => {
-            backoffTimer = null;
-            backoffMs = Math.min(MAX_BACKOFF_MS, backoffMs * 2);
-            void flushPipeline().catch(() => { }).finally(resolve);
-        }, backoffMs);
-    });
-}
-export function initTelemetryUpload(opts) {
-    clearIdleTimer();
-    clearBackoffTimer();
-    uploadEnabled = opts.enabled && !!opts.url;
-    endpoint = opts.url;
-    bearer = opts.token;
-    backoffMs = INITIAL_BACKOFF_MS;
-    resetStats();
-    if (!uploadEnabled) {
-        queue = [];
-    }
-}
-/**
- * 单行 NDJSON（已含 \\n）。
- * 满 BATCH_MAX_LINES 立即上传；否则自「当前积压周期」起至少间隔 MIN_PARTIAL_FLUSH_INTERVAL_MS 再上传。
- */
-export function enqueueTelemetryLine(line) {
-    if (!uploadEnabled || !endpoint)
-        return;
-    if (queue.length >= MAX_QUEUE) {
-        queue.splice(0, Math.floor(MAX_QUEUE / 4));
-    }
-    const wasEmpty = queue.length === 0;
-    queue.push(line);
-    if (queue.length >= BATCH_MAX_LINES) {
-        clearIdleTimer();
-        void flushPipeline().catch(() => {
-            /* 静默 */
-        });
-        return;
-    }
-    if (wasEmpty && !idleTimer && !flushing && !backoffTimer) {
-        schedulePartialFlush();
-    }
-}
-export async function shutdownTelemetryUpload() {
-    clearIdleTimer();
-    clearBackoffTimer();
-    if (!uploadEnabled || !endpoint) {
-        queue = [];
-        uploadEnabled = false;
-        endpoint = undefined;
-        bearer = undefined;
-        return;
-    }
-    const ep = endpoint;
-    const br = bearer;
-    const pending = queue;
-    queue = [];
-    uploadEnabled = false;
-    endpoint = undefined;
-    bearer = undefined;
-    const lines = pending;
-    while (lines.length > 0) {
-        const batch = lines.splice(0, BATCH_MAX_LINES);
-        try {
-            const body = batch.join('');
-            const headers = {
-                'content-type': 'application/x-ndjson',
-                accept: 'application/json',
-            };
-            if (br)
-                headers.authorization = `Bearer ${br}`;
-            const res = await fetch(ep, { method: 'POST', headers, body });
-            try {
-                if (typeof res.text === 'function') {
-                    await res.text();
-                }
-            }
-            catch {
-                /* ignore body read errors */
-            }
-            if (res.ok) {
-                stats.postedBatches += 1;
-                stats.postedLines += batch.length;
-            }
-            else if (res.status >= 400 && res.status < 500 && res.status !== 408 && res.status !== 429) {
-                stats.dropped4xxBatches += 1;
-                stats.dropped4xxLines += batch.length;
-            }
-            else {
-                stats.retryableFailures += 1;
-            }
-        }
-        catch {
-            stats.networkFailures += 1;
-            /* best effort，静默 */
-        }
-    }
-}
-export function getTelemetryUploadStats() {
-    return { ...stats };
-}