Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,32 +1,69 @@
package com.opentest.algorithm.runtime;

import com.opentest.core.jni.AlgorithmLibJNIBridge;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Map;
import java.util.stream.Stream;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

class AlgorithmLibBridgeContractTest {

@Test
void bkTriggerMethodsExposeTheFinalRawJniContract() throws Exception {
assertNative("createBkTriggerTask", int.class,
String.class, double.class, double.class, double.class, boolean.class,
int.class, int.class, int.class);
assertNative("searchBkTriggerTask", String.class,
String.class, double[].class, boolean.class);
assertNative("resetBkTriggerTask", int.class, String.class);
assertNative("disposeBkTriggerTask", int.class, String.class);
}

private void assertNative(String name, Class<?> returnType, Class<?>... parameterTypes)
throws Exception {
@ParameterizedTest(name = "{0} delegates to {1}")
@MethodSource("bindings")
void compatibilityMethodsMatchNeutralJniSignatures(String name, String nativeName,
Class<?> returnType, Class<?>[] parameterTypes) throws Exception {
Method method = AlgorithmLibJNIBridge.class.getDeclaredMethod(name, parameterTypes);
assertEquals(returnType, method.getReturnType());
assertTrue(Modifier.isPublic(method.getModifiers()));
assertTrue(Modifier.isNative(method.getModifiers()));
assertFalse(Modifier.isNative(method.getModifiers()));
Method nativeMethod = AlgorithmLibJNIBridge.class.getDeclaredMethod(nativeName, parameterTypes);
assertEquals(returnType, nativeMethod.getReturnType());
assertTrue(Modifier.isPrivate(nativeMethod.getModifiers()));
assertTrue(Modifier.isNative(nativeMethod.getModifiers()));
}

private static Stream<Arguments> bindings() {
return Stream.of(
Arguments.of("createBkFftTask", "createAdvancedFftTask", int.class, new Class<?>[] {String.class, double.class, int.class, double.class, int.class, double.class, int.class, double.class, double.class, double.class, double.class, int.class, int.class, double.class, double.class, int.class, int.class, int.class, int.class, int.class, int.class, double.class, double.class, int.class}),
Arguments.of("createBkFftSpectrogramTask", "createAdvancedFftSpectrogramTask", int.class, new Class<?>[] {String.class, double.class, int.class, double.class, int.class, double.class, int.class, double.class, double.class, double.class, double.class, int.class, int.class, double.class, double.class, int.class, int.class, int.class, int.class}),
Arguments.of("pushBkFftTask", "pushAdvancedFftTask", int.class, new Class<?>[] {String.class, double[].class, int.class}),
Arguments.of("readBkFftTask", "readAdvancedFftTask", int.class, new Class<?>[] {String.class, int.class, JniNamedDoubleResultCollector.class, Map.class}),
Arguments.of("readBkFftSelectedResult", "readAdvancedFftSelectedResult", int.class, new Class<?>[] {String.class, int.class, int.class, int.class, int.class, JniNamedDoubleResultCollector.class, String[].class}),
Arguments.of("resetBkFftTask", "resetAdvancedFftTask", int.class, new Class<?>[] {String.class}),
Arguments.of("disposeBkFftTask", "disposeAdvancedFftTask", int.class, new Class<?>[] {String.class}),
Arguments.of("createBkFrfTask", "createAdvancedFrequencyResponseTask", int.class, new Class<?>[] {String.class, double.class, int.class, double.class, int.class, double.class, int.class, double.class, double.class, double.class, double.class, int.class, int.class, double.class, double.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class, double.class, double.class, int.class}),
Arguments.of("pushBkFrfTask", "pushAdvancedFrequencyResponseTask", int.class, new Class<?>[] {String.class, double[].class, double[].class, int.class}),
Arguments.of("readBkFrfTask", "readAdvancedFrequencyResponseTask", int.class, new Class<?>[] {String.class, int.class, JniNamedDoubleResultCollector.class, Map.class}),
Arguments.of("readBkFrfSelectedResult", "readAdvancedFrequencyResponseSelectedResult", int.class, new Class<?>[] {String.class, int.class, int.class, int.class, int.class, JniNamedDoubleResultCollector.class, String[].class}),
Arguments.of("resetBkFrfTask", "resetAdvancedFrequencyResponseTask", int.class, new Class<?>[] {String.class}),
Arguments.of("disposeBkFrfTask", "disposeAdvancedFrequencyResponseTask", int.class, new Class<?>[] {String.class}),
Arguments.of("createBkCpbTask", "createPrecisionOctaveTask", int.class, new Class<?>[] {String.class, double.class, int.class, double.class, double.class, double.class, int.class, double.class, int.class, int.class, int.class, double.class, double.class, double.class, int.class, int.class, double.class, double.class}),
Arguments.of("createBkCpbSharedGroup", "createPrecisionOctaveSharedGroup", long.class, new Class<?>[] {String[].class}),
Arguments.of("processBkCpbSharedGroup", "processPrecisionOctaveSharedGroup", int.class, new Class<?>[] {long.class, double[][].class}),
Arguments.of("pushBkCpbTask", "pushPrecisionOctaveTask", int.class, new Class<?>[] {String.class, double[].class, int.class}),
Arguments.of("createBkCpbMultiTask", "createPrecisionOctaveMultiTask", int.class, new Class<?>[] {String.class, double.class, double[].class, double[].class, double.class, int.class, double.class, int.class, int.class, int.class, double.class, double.class, double.class, int.class, int.class, double.class, double.class}),
Arguments.of("readBkCpbMultiTask", "readPrecisionOctaveMultiTask", int.class, new Class<?>[] {String.class, JniNamedDoubleResultCollector.class, Map.class}),
Arguments.of("readBkCpbTask", "readPrecisionOctaveTask", int.class, new Class<?>[] {String.class, JniNamedDoubleResultCollector.class, Map.class}),
Arguments.of("readBkCpbSelectedResult", "readPrecisionOctaveSelectedResult", int.class, new Class<?>[] {String.class, int.class, int.class, int.class, JniNamedDoubleResultCollector.class, String[].class}),
Arguments.of("resetBkCpbTask", "resetPrecisionOctaveTask", int.class, new Class<?>[] {String.class}),
Arguments.of("disposeBkCpbTask", "disposePrecisionOctaveTask", int.class, new Class<?>[] {String.class}),
Arguments.of("createBkCpbFrfTask", "createPrecisionOctaveFrequencyResponseTask", int.class, new Class<?>[] {String.class, double.class, int.class, double.class, double.class, double.class, int.class, double.class, int.class, int.class, int.class, double.class, double.class, double.class, int.class, int.class, double.class, double.class, int.class, int.class}),
Arguments.of("pushBkCpbFrfTask", "pushPrecisionOctaveFrequencyResponseTask", int.class, new Class<?>[] {String.class, double[].class, double[].class, int.class}),
Arguments.of("readBkCpbFrfTask", "readPrecisionOctaveFrequencyResponseTask", int.class, new Class<?>[] {String.class, JniNamedDoubleResultCollector.class, Map.class}),
Arguments.of("readBkCpbFrfSelectedResult", "readPrecisionOctaveFrequencyResponseSelectedResult", int.class, new Class<?>[] {String.class, int.class, int.class, int.class, JniNamedDoubleResultCollector.class, String[].class}),
Arguments.of("resetBkCpbFrfTask", "resetPrecisionOctaveFrequencyResponseTask", int.class, new Class<?>[] {String.class}),
Arguments.of("disposeBkCpbFrfTask", "disposePrecisionOctaveFrequencyResponseTask", int.class, new Class<?>[] {String.class}),
Arguments.of("createBkTriggerTask", "createSignalTriggerTask", int.class, new Class<?>[] {String.class, double.class, double.class, double.class, boolean.class, int.class, int.class, int.class}),
Arguments.of("searchBkTriggerTask", "searchSignalTriggerTask", String.class, new Class<?>[] {String.class, double[].class, boolean.class}),
Arguments.of("resetBkTriggerTask", "resetSignalTriggerTask", int.class, new Class<?>[] {String.class}),
Arguments.of("disposeBkTriggerTask", "disposeSignalTriggerTask", int.class, new Class<?>[] {String.class}));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"platform": "macos-arm64",
"minimumMacOS": "12.0",
"configuration": "Release",
"algorithmCommit": "46a640bdc6d019ec4a51dbdef7f675d1c5700b06",
"nativeDriverBaseCommit": "a50dfde6fbb755c7b5171536f5c9d7d95b70647f",
"frameworkBaseCommit": "d2c55d82551e09d17cc288f8c07dfa2e741a2037",
"fftBackend": "FFTC",
"authorizationVariant": "production",
"validation": {
"algorithmCtestPassed": 16,
"driverSoftwareCtestPassed": 12,
"frontendNativeTestsPassed": 45,
"productionJniAuthorization": "default device001 license imported; unlicensed FFT feature correctly rejected (13300010)",
"hardwareTested": false,
"algorithmRuntimeJavaTestsPassed": 227,
"jniHeaderExportsMatched": 323,
"windowsAlgorithmExportsMatchedStatic": 148,
"packagingAndLicenseTestsPassed": 35,
"packagingAndLicenseTestsSkipped": 1,
"jniVerifierRegressionTestsPassed": 2,
"linuxBinaryCompatibilityVerified": false
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"payload":"qER0eXBlZ2xpY2Vuc2VIZmVhdHVyZXOFpURjb2RlZTkyMDA0RXZhbHVlZHRydWVHZW5kVGltZRsAAAR68lOoEElzdGFydFRpbWUbAAABnLGwllBJdmFsdWVUeXBlAKVEY29kZWU5MjAxMkV2YWx1ZWExR2VuZFRpbWUbAAAEevJTqBBJc3RhcnRUaW1lGwAAAZyxsJZQSXZhbHVlVHlwZQGlRGNvZGVlOTIwMDhFdmFsdWVhNEdlbmRUaW1lGwAABHryU6gQSXN0YXJ0VGltZRsAAAGcsbCWUEl2YWx1ZVR5cGUBpURjb2RlZTkyMDA5RXZhbHVlZHRydWVHZW5kVGltZRsAAAR68lOoEElzdGFydFRpbWUbAAABnLGwllBJdmFsdWVUeXBlAKVEY29kZWU5MjAxMUV2YWx1ZWQyNDAwR2VuZFRpbWUbAAAEevJTqBBJc3RhcnRUaW1lGwAAAZyxsJZQSXZhbHVlVHlwZQFIaXNzdWVkQXQbAAABn9TII8ZJZXhwaXJlc0F0GwAABH3gXMQYSWxpY2Vuc2VJZAFJbWFjaGluZUlkaWRldmljZTAwMUlub3RCZWZvcmUbAAABn9TII8ZLb2ZmbGluZURheXMaAA9CPw==","signature":"MEQCIFHQzyRudRXO4MtZjTzit/evGvXk470bnocYxyJ4TXK4AiBRF4wSmnqscMa4uvhiohYfpioRWyLCr8/qx8rV5i/viQ==","algorithm":"sha256-ecdsa","assetList":[{"skuInfo":{"code":"community","name":"OpenTest Community","type":"EDITION","description_items":["2 Channels","Monitor & Generator","Basic FFT","Basic Octave","Basic Sweep"],"descriptionItems":["2 Channels","Monitor & Generator","Basic FFT","Basic Octave","Basic Sweep"],"features":[{"name":"Monitor"},{"name":"Generator"}]},"authorizationCode":"CKFR-SAX3-JSJ7-LZGN","expireTime":4926098090000,"isExpired":false}]}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# macOS ARM64 native runtime

Production-only runtime, built from the same algorithm commit as the Windows SDK (`46a640bdc6d0`, on `sxp_dev`). The C++ driver and frontend use FFTC. `License.dat` and `libcry_analyst.dylib` reside directly in this directory; there is no `prd` override or development authorization payload.

Core runtime requires macOS 12 or later. SonoDAQ is an external plugin and its SDK 1.4.0 requires macOS 26. It is not bundled here. Private diagnostic tools are not application runtime dependencies.

See `BUILD-INFO.json` for provenance and test results. The signed default `device001` license imports successfully after aligning macOS with Windows machine-ID policy. It does not grant FFT access; full authorized FFT execution and hardware acceptance remain unverified. The development/test SDK remains in NativeDriver. Checksums cover the runtime binaries and default license; documentation and build metadata are excluded. They do not imply additional license rights.

## Reproduce verification

Run the following on Apple Silicon macOS. The Maven commands prepare the classpath without running unrelated backend tests; they are not acceptance tests. `javac -h` generates JNI declarations from the current bridge sources, including generics, multiline declarations, escaping and overloads. The verifier checks every generated macOS export, loads all eight dylibs, validates ARM64/hash/path constraints, optionally checks existing Windows algorithm exports, and runs the default-license smoke test under `-Xcheck:jni`. The smoke test releases the license state in a `finally` block. It does not exercise licensed FFT or hardware.

```sh
# From the OpenTest repository root, with JDK 21+, Maven and Node on PATH.
mvn -B --no-transfer-progress -f apps/backend/pom.xml -pl crydaq-core -am -Dmaven.test.skip=true install
mvn -B --no-transfer-progress -f apps/backend/crydaq-core/pom.xml dependency:build-classpath -Dmdep.outputFile=target/macos-jni-dependencies.txt
JNI_CP="apps/backend/crydaq-core/target/classes:apps/backend/crydaq-algorithm-runtime/target/classes:$(cat apps/backend/crydaq-core/target/macos-jni-dependencies.txt)"
python3 tools/verify-macos-native.py --class-path "$JNI_CP" --windows-native apps/backend/crydaq-server/src/main/resources/native/windows-amd64 --smoke
```

The optional Windows check is static PE export inspection, not Windows execution. There is no Linux backend payload in this checkout; Linux binary compatibility remains unverified. NativeDriver's fixed base `a50dfde6fbb755c7b5171536f5c9d7d95b70647f` defines the neutral JNI names in the shared POSIX source/header, but this is source evidence only, not proof for externally supplied Linux binaries. Do not treat this delivery as Linux acceptance.

## Algorithm provenance and authorization review

`algorithm-build-info.json` identifies the exact historical algorithm commit, DLL hash and patch. The base was detached, so `sourceBranch` remains empty and `sourceTreeDirty` truthfully records the applied patch. The patch is preserved in the private NativeDriver repository at commit `92982a31a6545fb87103a0acaadaaa348ae0439b`, path `dependencies/algorithm/macos/algorithm-fftc.patch`, SHA256 `da3e70b9285619c23b8280488ff918b59b16dbd758fa392e852245c2dbed6655`. Authorized reviewers can check out algorithm commit `46a640bdc6d019ec4a51dbdef7f675d1c5700b06`, verify the patch hash and apply it with `git apply`. Access to the private sources/FFTC dependency is required to rebuild; no private algorithm source is published here.

The signed initial `device001` PC license skips machine matching, as required for the default-license delivery. This does not grant additional features: the bundled default still rejects FFT with 13300010. Signature and explicit USB identity checks remain in the recorded patch. The patch does not restrict the machine-match exception by SKU; the authorization owner must confirm the issuer policy and prevent issuing higher-rights licenses to this initial ID. This is an outstanding policy review, not a reason to silently alter authorization logic in this macOS PR.

The production-only layout is intentional. Selecting macOS test mode fails before staging, and a missing/empty root `License.dat` is rejected. A product/release owner should confirm the default community FFT feature-denial behavior. No test algorithm, replacement license or rights bypass is packaged to hide that result.

The verifier regression tests run with `python3 -m unittest discover -s tools/__tests__ -p test_verify_macos_native.py` (JDK on PATH or JAVA_HOME).

The macOS and existing Windows default license JSON payload and signature are identical; the files differ only by a trailing newline. The original macOS file is retained.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# macOS ARM64 原生运行库

仅包含生产运行库,算法固定使用 Windows SDK 对应的 `sxp_dev` 历史提交 `46a640bdc6d0`。C++ 驱动和前端均使用 FFTC。`License.dat` 与 `libcry_analyst.dylib` 直接位于本目录,不再设置 `prd` 或分发开发授权材料。

核心运行库最低要求 macOS 12。SonoDAQ 属于外部插件,其 SDK 1.4.0 最低要求 macOS 26,不在本目录中打包。私有诊断工具不属于应用运行依赖。

构建来源及测试结果见 `BUILD-INFO.json`。已统一 macOS 与 Windows 的设备 ID 规则,签名有效的默认 `device001` 授权可正常导入。该默认文件未授予 FFT 权限,完整 FFT 调用及真机验收尚未验证。NativeDriver 保留开发/测试 SDK。校验和仅覆盖运行时二进制与默认授权,不覆盖文档和构建元数据,也不代表增加授权权益。

## 复现验证

在 Apple Silicon macOS、JDK 21+、Maven 与 Node 环境中执行以下命令。Maven 命令仅准备编译类和依赖,不运行无关后端测试,不等于验收通过。校验器使用 `javac -h` 从当前桥接源码生成 JNI 声明,正确处理泛型、多行声明、转义和重载,然后检查 macOS 导出、8 个动态库加载、ARM64 架构、校验和及开发机路径,并在真实 JVM 的 `-Xcheck:jni` 下验证默认授权。冒烟测试通过 `finally` 释放授权状态;不验证完整授权 FFT 和硬件。

```sh
# From the OpenTest repository root, with JDK 21+, Maven and Node on PATH.
mvn -B --no-transfer-progress -f apps/backend/pom.xml -pl crydaq-core -am -Dmaven.test.skip=true install
mvn -B --no-transfer-progress -f apps/backend/crydaq-core/pom.xml dependency:build-classpath -Dmdep.outputFile=target/macos-jni-dependencies.txt
JNI_CP="apps/backend/crydaq-core/target/classes:apps/backend/crydaq-algorithm-runtime/target/classes:$(cat apps/backend/crydaq-core/target/macos-jni-dependencies.txt)"
python3 tools/verify-macos-native.py --class-path "$JNI_CP" --windows-native apps/backend/crydaq-server/src/main/resources/native/windows-amd64 --smoke
```

可选的 Windows 检查仅静态读取 PE 导出表,不是 Windows 实际执行。当前仓库没有 Linux 后端运行库,因此 Linux 二进制兼容性尚未验证。NativeDriver 固定基线 `a50dfde6fbb755c7b5171536f5c9d7d95b70647f` 的共享 POSIX 源码/头文件已声明中性 JNI 名称,但源码证据不能证明外部 Linux 二进制兼容;本交付不代表 Linux 验收。

## 算法来源与授权审核

`algorithm-build-info.json` 记录算法历史提交、库哈希和补丁位置。基线以 detached 模式构建,因此保留空 `sourceBranch`,`sourceTreeDirty` 如实表示应用过补丁。补丁已保存于私有 NativeDriver 仓库提交 `92982a31a6545fb87103a0acaadaaa348ae0439b`,路径 `dependencies/algorithm/macos/algorithm-fftc.patch`,SHA256 为 `da3e70b9285619c23b8280488ff918b59b16dbd758fa392e852245c2dbed6655`。有权限的审核者可检出算法提交 `46a640bdc6d019ec4a51dbdef7f675d1c5700b06`,核对补丁哈希后通过 `git apply` 应用。复现构建需要私有源码及 FFTC 依赖,本仓库不公开私有算法源码。

按默认授权交付要求,签名有效的初始 `device001` PC 授权跳过机器匹配,但不会获得额外功能;默认文件的 FFT 仍返回 13300010。签名及显式 USB 身份检查仍保留于上述补丁。补丁没有按 SKU 限制这条机器匹配豁免,需授权负责人确认签发规则,避免用初始 ID 签发高权益许可证。这是待确认的策略事项,不在 macOS PR 中擅自修改授权逻辑。

仅生产运行库的平铺交付是明确要求。macOS 选择 test 模式会在暂存前失败,根目录缺失或空 `License.dat` 也会被拒绝。默认社区包的 FFT 权限拒绝行为仍需产品/发布负责人确认;不通过打入测试算法、替换授权或绕过权益来隐藏该结果。

校验工具自身的回归测试:`python3 -m unittest discover -s tools/__tests__ -p test_verify_macos_native.py`,需通过 PATH 或 JAVA_HOME 配置 JDK。

macOS 与当前 Windows 默认授权的 JSON 载荷和签名相同,仅文件末尾换行有差异;保留原始 macOS 文件。
Loading
Loading