diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..8f4d560a --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +@crysound:registry=https://registry.npmjs.org/ diff --git a/apps/frontend/README.md b/apps/frontend/README.md index c9e51238..475c1d6b 100644 --- a/apps/frontend/README.md +++ b/apps/frontend/README.md @@ -23,7 +23,7 @@ npx --yes pnpm@10.6.5 --filter @opentest/frontend build 根启动入口默认使用前端端口 `19010`、Java 接口端口 `15021`、gRPC(桌面与 Java 之间的实时消息协议)端口 `19021`。前端开发服务通过 `/api` 转发业务请求,端口和目标地址分别由 `VITE_DEV_SERVER_PORT`、`VITE_VUE_DEV_APP_API` 指定。生产运行由桌面加载前端产物并提供 `/api` 转发。 -桌面本机配置默认位于 `apps/desktop/.runtime/local-settings.json`,可从 `apps/desktop/local-settings.example.json` 准备,或用 `OPENTEST_LOCAL_SETTINGS_PATH` 指定其他文件。其 `auth` 字段只向前端注入公开登录参数;Java 的身份服务配置必须与之匹配,密钥保留在后端本机配置中。桌面配置的 `cryChart` 字段提供 CryChart(当前图表库)的现有许可证,许可证不写入源码。 +桌面本机配置默认位于 `apps/desktop/.runtime/local-settings.json`,可从 `apps/desktop/local-settings.example.json` 准备,或用 `OPENTEST_LOCAL_SETTINGS_PATH` 指定其他文件。其 `auth` 字段只向前端注入公开登录参数;Java 的身份服务配置必须与之匹配,密钥保留在后端本机配置中。CRYChart 无需图表运行许可证或许可环境变量。 只开发前端时,从仓库根运行 `pnpm dev:frontend`。该入口构建公共 SDK 后启动 Vite,不要求 `runtime.env`、后端授权字段或 JDK,也不创建后端运行与项目目录。可选的 `runtime.env` 提供 `FRONTEND_PORT`、`BACKEND_PORT` 和图表配置;前端其他 `VITE_*` 配置仍可参考 [.env.example](.env.example) 放入不入库的 `.env.local`。真实登录和业务功能仍需要可用的 Java 后端,桌面专属能力仍需要桌面运行环境。详见[开发与打包说明](../../docs/development-and-packaging.md)。 @@ -31,6 +31,8 @@ npx --yes pnpm@10.6.5 --filter @opentest/frontend build 图表公共接口 `FrameworkChartApi`(接收数据、控制显示并释放图表的框架接口)位于 `src/libs/charts/api/`,数据类型和旧数据转换位于 `src/libs/data-models/`。`src/libs/charts/registry/` 只选择随框架发布的绘图实现,不登记业务插件。`src/libs/charts/adapters/crychart/` 持有供应商实例、主题、光标和既有 Monitor 绘图实现;激励预览、输出校准已通过框架接口接收样本、设置坐标范围并释放资源。新增业务代码使用框架接口,图表库的直接导入集中在适配目录。窗口关闭或图形重建时由适配器释放资源,这些接口不依赖后端插件运行时。 +图表依赖固定为 npmjs.com 的 `@crysound/crychart@1.0.1`,随包提供主入口与 `@crysound/crychart/themes` 的 TypeScript 声明。日常使用根目录 `pnpm install --frozen-lockfile`,不再复制 tgz。首次接入、升级及构建校验见 [CRYChart 接入说明](../../docs/crychart-integration.zh-CN.md)。 + 本机算法和文件解析工作线程在创建后先接收桌面传入的 `nativeModulesPath`(本机模块目录),随后才处理任务。通信通过公共开发包传递,原有消息格式和本机解码行为保持兼容。行为埋点初始化、事件、路由与网络上报已移除;诊断日志、任务进度和采集信号保留。 源码运行默认只显示版本,不连接旧商业更新服务。仅桌面明确提供适配当前 `opentest-framework` 产品的更新源,且运行已打包产品时,才提供下载与安装动作。检查响应须声明匹配的产品标识;没有更新配置时不会发送更新请求。 diff --git a/apps/frontend/package.json b/apps/frontend/package.json index a60c3011..ba8baa74 100644 --- a/apps/frontend/package.json +++ b/apps/frontend/package.json @@ -27,7 +27,7 @@ "@antv/x6-plugin-minimap": "2.0.7", "@antv/x6-vue-shape": "2.1.2", "@element-plus/icons-vue": "2.3.1", - "crychart": "file:../../vendor/crychart/crychart-1.0.1-opentest.30.tgz", + "@crysound/crychart": "1.0.1", "@number-flow/vue": "0.5.2", "@vueuse/core": "12.7.0", "axios": "1.7.9", diff --git a/apps/frontend/public/THIRD-PARTY-NOTICES.txt b/apps/frontend/public/THIRD-PARTY-NOTICES.txt index 3ea83fc6..b5dd7a63 100644 --- a/apps/frontend/public/THIRD-PARTY-NOTICES.txt +++ b/apps/frontend/public/THIRD-PARTY-NOTICES.txt @@ -7,17 +7,10 @@ CRYChart Copyright and license: see licenses/CRYChart-Community-1.0.en.md and licenses/CRYChart-Community-1.0.zh-CN.md. -OpenTest uses the modified consumer version 1.0.1-opentest.25. -This consumer version is maintained for OpenTest and is not an official -upstream CRYChart release. Upstream source: https://github.com/crysound/CRYChart -Base commit: cc7a1d0bed680125f419b38a3bb2a3145615dc37. -Consumer fixes commit: d4e9a2b (fix/opentest-migration-20261110). - -Significant modifications cover application CSS fonts and content layout, -theme/legend/axis appearance, axis resume notifications, full-source fallback -for transparent waveforms, cached constant-coordinate 3D planes, -and perspective camera framing based on projected geometric spans, -with fitting margins independent of plot clipping and padding. -The original CRYChart code and these modifications remain under the -accompanying CRYChart license. The exact source patch and artifact identity -are recorded in OpenTest's vendor/crychart/manifest.json. +OpenTest uses the official public npm package @crysound/crychart@1.0.1. +Package: https://www.npmjs.com/package/@crysound/crychart +Upstream source: https://github.com/crysound/CRYChart +This release incorporates the OpenTest consumer fixes merged upstream. +CRYChart remains under the accompanying CRYChart Community License 1.0, +including its commercial-use conditions. The exact dependency version and +package integrity are recorded in OpenTest's pnpm-lock.yaml. diff --git a/apps/frontend/src/components/charts/realtime-trend-chart/__tests__/index.test.ts b/apps/frontend/src/components/charts/realtime-trend-chart/__tests__/index.test.ts index 38131e08..25b4d2ed 100644 --- a/apps/frontend/src/components/charts/realtime-trend-chart/__tests__/index.test.ts +++ b/apps/frontend/src/components/charts/realtime-trend-chart/__tests__/index.test.ts @@ -243,7 +243,7 @@ const mocks = vi.hoisted(() => { } }) -vi.mock('crychart', () => ({ +vi.mock('@crysound/crychart', () => ({ AxisScrollStrategies: { scrolling: mocks.axisScrollStrategies.scrolling, fitting: mocks.axisScrollStrategies.fitting diff --git a/apps/frontend/src/components/charts/realtime-trend-chart/index.vue b/apps/frontend/src/components/charts/realtime-trend-chart/index.vue index e38a7a95..22f82ec9 100644 --- a/apps/frontend/src/components/charts/realtime-trend-chart/index.vue +++ b/apps/frontend/src/components/charts/realtime-trend-chart/index.vue @@ -11,7 +11,7 @@ import { StipplePatterns, UIElementBuilders, UIOrigins -} from 'crychart' +} from '@crysound/crychart' import type { ChartXYLayoutChangedEvent, ChartXY, @@ -22,7 +22,7 @@ import type { TimeTickStrategy, UIElement, UITextBox -} from 'crychart' +} from '@crysound/crychart' import { useCryChart } from '@/libs/charts/adapters/crychart/use-engine' import type { RealtimeTrendSample } from '../../../../../../sdks/plugin/typescript/ui' import { getCssVarValue } from '@/utils' diff --git a/apps/frontend/src/composables/dashboard/__tests__/dynamic-cycle-chart.test.ts b/apps/frontend/src/composables/dashboard/__tests__/dynamic-cycle-chart.test.ts index 544aa3d2..e35a4fc7 100644 --- a/apps/frontend/src/composables/dashboard/__tests__/dynamic-cycle-chart.test.ts +++ b/apps/frontend/src/composables/dashboard/__tests__/dynamic-cycle-chart.test.ts @@ -69,7 +69,7 @@ vi.mock('element-plus', () => ({ })) -vi.mock('crychart', () => ({ +vi.mock('@crysound/crychart', () => ({ AxisTickStrategies: { Empty: 'Empty', Numeric: 'Numeric', Time: 'Time' }, ColorHEX: vi.fn(value => value), SolidFill: class {}, SolidLine: class {}, DashedLine: class {}, Themes: { darkGold: {} }, disableTextShadows: vi.fn(theme => theme), diff --git a/apps/frontend/src/libs/charts/adapters/crychart/__tests__/crychart-realtime-axis.test.ts b/apps/frontend/src/libs/charts/adapters/crychart/__tests__/crychart-realtime-axis.test.ts index c02bfa5e..2c714b6f 100644 --- a/apps/frontend/src/libs/charts/adapters/crychart/__tests__/crychart-realtime-axis.test.ts +++ b/apps/frontend/src/libs/charts/adapters/crychart/__tests__/crychart-realtime-axis.test.ts @@ -1,8 +1,8 @@ -import type { Axis } from 'crychart' +import type { Axis } from '@crysound/crychart' import { axisFixture } from '../legacy/__tests__/chart-fixtures' import { describe, expect, it, vi } from 'vitest' -vi.mock('crychart', () => ({ +vi.mock('@crysound/crychart', () => ({ Axis: class Axis {}, AxisScrollStrategies: { scrolling: 'scrolling' diff --git a/apps/frontend/src/libs/charts/adapters/crychart/__tests__/crychart.test.ts b/apps/frontend/src/libs/charts/adapters/crychart/__tests__/crychart.test.ts index 096c06ce..bf44b851 100644 --- a/apps/frontend/src/libs/charts/adapters/crychart/__tests__/crychart.test.ts +++ b/apps/frontend/src/libs/charts/adapters/crychart/__tests__/crychart.test.ts @@ -1,4 +1,4 @@ -import { ChartXY } from 'crychart' +import { ChartXY } from '@crysound/crychart' import { beforeEach, describe, expect, it, vi } from 'vitest' const mocks = vi.hoisted(() => ({ @@ -8,7 +8,7 @@ const mocks = vi.hoisted(() => ({ primaryColor: '#000000' })) -vi.mock('crychart', () => ({ +vi.mock('@crysound/crychart', () => ({ ChartXY: class ChartXY { engine = { captureFrame: vi.fn() } }, transparentFill: {}, SolidFill: class SolidFill {}, @@ -17,7 +17,7 @@ vi.mock('crychart', () => ({ cryChart: vi.fn() })) -vi.mock('crychart/themes', () => ({ +vi.mock('@crysound/crychart/themes', () => ({ makeCustomTheme: mocks.makeCustomTheme })) diff --git a/apps/frontend/src/libs/charts/adapters/crychart/__tests__/line-chart.test.ts b/apps/frontend/src/libs/charts/adapters/crychart/__tests__/line-chart.test.ts index 795c448f..50357c88 100644 --- a/apps/frontend/src/libs/charts/adapters/crychart/__tests__/line-chart.test.ts +++ b/apps/frontend/src/libs/charts/adapters/crychart/__tests__/line-chart.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' const fixture = vi.hoisted(() => ({ engines: [] as Array>, failCreate: false })) -vi.mock('crychart', () => ({ +vi.mock('@crysound/crychart', () => ({ AxisTickStrategies: { Numeric: 'numeric' }, ColorHEX: (value: string) => value, SolidFill: class { constructor(public options: unknown) {} }, diff --git a/apps/frontend/src/libs/charts/adapters/crychart/components/__tests__/equalizer-preview.test.ts b/apps/frontend/src/libs/charts/adapters/crychart/components/__tests__/equalizer-preview.test.ts index a6b53573..3b95b636 100644 --- a/apps/frontend/src/libs/charts/adapters/crychart/components/__tests__/equalizer-preview.test.ts +++ b/apps/frontend/src/libs/charts/adapters/crychart/components/__tests__/equalizer-preview.test.ts @@ -5,7 +5,7 @@ const { chartXY } = vi.hoisted(() => ({ chartXY: vi.fn() })) vi.mock('@/libs/charts/adapters/crychart/use-engine', () => ({ useCryChart: () => ({ lc: { ChartXY: chartXY }, theme: { value: {} } }) })) -vi.mock('crychart', () => ({ +vi.mock('@crysound/crychart', () => ({ AxisTickStrategies: { Numeric: 'Numeric' }, ColorHEX: vi.fn(), ColorRGBA: vi.fn(), diff --git a/apps/frontend/src/libs/charts/adapters/crychart/components/__tests__/generator-preview.test.ts b/apps/frontend/src/libs/charts/adapters/crychart/components/__tests__/generator-preview.test.ts index 82e5e0aa..a821a9d1 100644 --- a/apps/frontend/src/libs/charts/adapters/crychart/components/__tests__/generator-preview.test.ts +++ b/apps/frontend/src/libs/charts/adapters/crychart/components/__tests__/generator-preview.test.ts @@ -35,7 +35,7 @@ const disableTextShadowsMock = vi.hoisted(() => vi.fn(theme => ({ ...theme, text const htmlTextRendererMock = vi.hoisted(() => ({ type: 'html-text-renderer' })) const chartTheme = vi.hoisted(() => ({ name: 'generator-preview-theme' })) -vi.mock('crychart', () => ({ +vi.mock('@crysound/crychart', () => ({ AxisTickStrategies: { Numeric: 'Numeric' }, diff --git a/apps/frontend/src/libs/charts/adapters/crychart/components/__tests__/preview-chart-frame.test.ts b/apps/frontend/src/libs/charts/adapters/crychart/components/__tests__/preview-chart-frame.test.ts index 34e536f1..4958a93c 100644 --- a/apps/frontend/src/libs/charts/adapters/crychart/components/__tests__/preview-chart-frame.test.ts +++ b/apps/frontend/src/libs/charts/adapters/crychart/components/__tests__/preview-chart-frame.test.ts @@ -8,7 +8,7 @@ const disableTextShadowsMock = vi.hoisted(() => vi.fn(theme => ({ ...theme, text const htmlTextRendererMock = vi.hoisted(() => ({ type: 'html-text-renderer' })) const chartTheme = vi.hoisted(() => ({ name: 'preview-chart-theme' })) -vi.mock('crychart', () => ({ +vi.mock('@crysound/crychart', () => ({ disableTextShadows: disableTextShadowsMock, disableThemeEffects: disableThemeEffectsMock, htmlTextRenderer: htmlTextRendererMock diff --git a/apps/frontend/src/libs/charts/adapters/crychart/components/equalizer-preview.vue b/apps/frontend/src/libs/charts/adapters/crychart/components/equalizer-preview.vue index 021aa1a7..80f53eb5 100644 --- a/apps/frontend/src/libs/charts/adapters/crychart/components/equalizer-preview.vue +++ b/apps/frontend/src/libs/charts/adapters/crychart/components/equalizer-preview.vue @@ -23,7 +23,7 @@