diff --git a/tools/chatgui-android/jni_bridge/android_jni_bridge.c b/tools/chatgui-android/jni_bridge/android_jni_bridge.c index ae0211eb1..0bf2231d2 100644 --- a/tools/chatgui-android/jni_bridge/android_jni_bridge.c +++ b/tools/chatgui-android/jni_bridge/android_jni_bridge.c @@ -1739,6 +1739,41 @@ static __thread int g_log_callback_active; /* Callback не может реку static jobject g_event_callback = NULL; static jmethodID g_event_mid = NULL; +enum bridge_query_kind { QUERY_CHANNELS, QUERY_MESSAGES, QUERY_MEMBERS, QUERY_DETAIL, QUERY_LINKS, QUERY_NODE, + QUERY_OWNER, QUERY_MEMBERSHIP, QUERY_SETTING, QUERY_SOUND, QUERY_RADIO_SUBSCRIBERS, QUERY_RADIO_START }; +/* Строки/ID заимствованы до возврата instance_lite_call; JSON становится собственностью JNI caller. */ +struct bridge_query { + enum bridge_query_kind kind; + const char* channel; + const uint8_t* anchor; + uint64_t node; + int limit, exact; + int64_t number; + char* json; +}; +static void bridge_query_run(void* arg) { + struct bridge_query* q = arg; + switch (q->kind) { + case QUERY_CHANNELS: q->json = utun_bridge_get_channels_json(); break; + case QUERY_MESSAGES: q->json = utun_bridge_get_messages_json(q->channel, q->limit, q->anchor, q->exact); break; + case QUERY_MEMBERS: q->json = utun_bridge_get_channel_members_json(q->channel); break; + case QUERY_DETAIL: q->json = utun_bridge_get_member_detail_json(q->channel, q->node); break; + case QUERY_LINKS: q->json = utun_bridge_get_member_links_json(q->node); break; + case QUERY_NODE: q->number = (int64_t)utun_bridge_get_my_node_id(); break; + case QUERY_OWNER: q->number = utun_bridge_is_channel_owner(q->channel); break; + case QUERY_MEMBERSHIP: q->number = topo_node_sqlite_member_in_channel(instance_lite_get_instance()->topo_sqlite_db, + q->channel, q->node); break; + case QUERY_SETTING: q->number = utun_bridge_chat_setting_get_int(q->channel, (int)q->number); break; + case QUERY_SOUND: q->number = utun_bridge_get_sound_on_message(q->channel); break; + case QUERY_RADIO_SUBSCRIBERS: q->number = utun_bridge_radio_subscribers(q->node); break; + case QUERY_RADIO_START: q->number = utun_bridge_radio_audio_start(q->node, q->limit); break; + } +} +static int bridge_query_call(struct bridge_query* query) { + if (!instance_lite_call(bridge_query_run, query)) return 0; + bridge_log(BLEV_WARN, "Core query unavailable/cancelled kind=%d", query->kind); return -1; +} + JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) { (void)reserved; g_jvm = vm; @@ -2280,7 +2315,9 @@ JNIEXPORT void JNICALL Java_com_utun_chat_data_NativeLib_nativeConnectNode( JNIEXPORT jstring JNICALL Java_com_utun_chat_data_NativeLib_nativeGetChannels( JNIEnv* env, jobject thiz) { (void)thiz; - char* json = utun_bridge_get_channels_json(); + struct bridge_query query = {.kind = QUERY_CHANNELS}; + if (bridge_query_call(&query)) return NULL; + char* json = query.json; jstring result = jni_text(env, json); u_free(json); return result; @@ -2292,23 +2329,12 @@ JNIEXPORT jstring JNICALL Java_com_utun_chat_data_NativeLib_nativeGetMessages( uint8_t id[32]; if (jni_message_id(env, anchor, id) < 0) return NULL; const char* ch = jni_utf8(env, channelId); - char* json = utun_bridge_get_messages_json(ch, (int)limit, (*env)->GetArrayLength(env, anchor) ? id : NULL, exact); - /* String(byte[], UTF-8) корректно восстанавливает четырёхбайтовые emoji. */ - jclass strings = (*env)->FindClass(env, "java/lang/String"); - jmethodID constructor = strings ? (*env)->GetMethodID(env, strings, "", "([BLjava/lang/String;)V") : NULL; - size_t bytes = json ? strlen(json) : 0; - jbyteArray data = (*env)->NewByteArray(env, (jsize)bytes); - jstring charset = jni_text(env, "UTF-8"); - jstring result = NULL; - if (constructor && data && charset) { - (*env)->SetByteArrayRegion(env, data, 0, (jsize)bytes, (const jbyte*)json); - if (!(*env)->ExceptionCheck(env)) result = (jstring)(*env)->NewObject(env, strings, constructor, data, charset); - } - if (!result) DEBUG_ERROR(DEBUG_CATEGORY_CHAT, "bridge: UTF-8 message result allocation failed"); - if (data) (*env)->DeleteLocalRef(env, data); - if (charset) (*env)->DeleteLocalRef(env, charset); - if (strings) (*env)->DeleteLocalRef(env, strings); - u_free(json); + if (!ch) return NULL; + struct bridge_query query = {.kind = QUERY_MESSAGES, .channel = ch, .limit = limit, + .anchor = (*env)->GetArrayLength(env, anchor) ? id : NULL, .exact = exact}; + bridge_query_call(&query); + jstring result = jni_text(env, query.json); + u_free(query.json); u_free((void*)ch); return result; } @@ -2412,10 +2438,11 @@ JNIEXPORT jboolean JNICALL Java_com_utun_chat_data_NativeLib_nativeDmInvite( JNIEXPORT jboolean JNICALL Java_com_utun_chat_data_NativeLib_nativeIsChannelMember( JNIEnv* env, jobject thiz, jstring channel, jlong node) { (void)thiz; - struct UTUN_INSTANCE* inst = instance_lite_get_instance(); const char* id = jni_utf8(env, channel); if (!id) { bridge_log(BLEV_ERROR, "channel membership: string conversion failed"); return JNI_FALSE; } - int member = inst && topo_node_sqlite_member_in_channel(inst->topo_sqlite_db, id, (uint64_t)node); + struct bridge_query query = {.kind = QUERY_MEMBERSHIP, .channel = id, .node = (uint64_t)node}; + bridge_query_call(&query); + int member = (int)query.number; u_free((void*)id); return member ? JNI_TRUE : JNI_FALSE; } @@ -2468,7 +2495,9 @@ JNIEXPORT jboolean JNICALL Java_com_utun_chat_data_NativeLib_nativeDmSendFile( JNIEXPORT jlong JNICALL Java_com_utun_chat_data_NativeLib_nativeGetMyNodeId( JNIEnv* env, jobject thiz) { (void)env; (void)thiz; - return (jlong)utun_bridge_get_my_node_id(); + struct bridge_query query = {.kind = QUERY_NODE}; + bridge_query_call(&query); + return (jlong)query.number; } JNIEXPORT jboolean JNICALL Java_com_utun_chat_data_NativeLib_nativeRestart( @@ -2581,8 +2610,9 @@ JNIEXPORT void JNICALL Java_com_utun_chat_data_NativeLib_nativeSetChatSetting( JNIEnv* env, jobject thiz, jstring name, jint def) { (void)thiz; const char* n = jni_utf8(env, name); - struct UTUN_INSTANCE* inst = instance_lite_get_instance(); - int val = chat_setting_get_int(inst, n, (int)def); + struct bridge_query query = {.kind = QUERY_SETTING, .channel = n, .number = def}; + bridge_query_call(&query); + int val = (int)query.number; if (n) u_free((void*)n); return (jint)val; } @@ -2591,7 +2621,9 @@ JNIEXPORT jint JNICALL Java_com_utun_chat_data_NativeLib_nativeGetSoundOnMessage JNIEnv* env, jobject thiz, jstring chId) { (void)thiz; const char* c = jni_utf8(env, chId); - int on = utun_bridge_get_sound_on_message(c); + struct bridge_query query = {.kind = QUERY_SOUND, .channel = c, .number = 1}; + bridge_query_call(&query); + int on = (int)query.number; if (c) u_free((void*)c); return (jint)on; } @@ -2838,7 +2870,9 @@ JNIEXPORT jstring JNICALL Java_com_utun_chat_data_NativeLib_nativeGetChannelMemb JNIEnv* env, jobject thiz, jstring channelId) { (void)thiz; const char* ch = jni_utf8(env, channelId); - char* json = utun_bridge_get_channel_members_json(ch); + struct bridge_query query = {.kind = QUERY_MEMBERS, .channel = ch}; + bridge_query_call(&query); + char* json = query.json; jstring result = jni_text(env, json); u_free(json); u_free((void*)ch); @@ -2849,7 +2883,9 @@ JNIEXPORT jstring JNICALL Java_com_utun_chat_data_NativeLib_nativeGetMemberDetai JNIEnv* env, jobject thiz, jstring channelId, jlong nodeId) { (void)thiz; const char* ch = jni_utf8(env, channelId); - char* json = utun_bridge_get_member_detail_json(ch, (uint64_t)nodeId); + struct bridge_query query = {.kind = QUERY_DETAIL, .channel = ch, .node = (uint64_t)nodeId}; + bridge_query_call(&query); + char* json = query.json; jstring result = jni_text(env, json); u_free(json); u_free((void*)ch); @@ -2881,7 +2917,9 @@ JNIEXPORT jboolean JNICALL Java_com_utun_chat_data_NativeLib_nativeIsChannelOwne JNIEnv* env, jobject thiz, jstring channelId) { (void)thiz; const char* ch = jni_utf8(env, channelId); - int owner = utun_bridge_is_channel_owner(ch); + struct bridge_query query = {.kind = QUERY_OWNER, .channel = ch}; + bridge_query_call(&query); + int owner = (int)query.number; u_free((void*)ch); return (jboolean)owner; } @@ -2915,7 +2953,9 @@ JNIEXPORT void JNICALL Java_com_utun_chat_data_NativeLib_nativeSetMemberFlags( JNIEXPORT jstring JNICALL Java_com_utun_chat_data_NativeLib_nativeGetMemberLinks( JNIEnv* env, jobject thiz, jlong nodeId) { (void)thiz; - char* json = utun_bridge_get_member_links_json((uint64_t)nodeId); + struct bridge_query query = {.kind = QUERY_LINKS, .node = (uint64_t)nodeId}; + if (bridge_query_call(&query)) return NULL; + char* json = query.json; jstring result = jni_text(env, json); u_free(json); return result; @@ -3157,13 +3197,16 @@ JNIEXPORT void JNICALL Java_com_utun_chat_data_NativeLib_nativeRadioSetActive( JNIEXPORT jint JNICALL Java_com_utun_chat_data_NativeLib_nativeRadioSubscribers( JNIEnv* env, jobject thiz, jlong groupId) { (void)env; (void)thiz; - return (jint)utun_bridge_radio_subscribers((uint64_t)groupId); + struct bridge_query query = {.kind = QUERY_RADIO_SUBSCRIBERS, .node = (uint64_t)groupId}; + bridge_query_call(&query); + return (jint)query.number; } JNIEXPORT jboolean JNICALL Java_com_utun_chat_data_NativeLib_nativeRadioAudioStart( JNIEnv* env, jobject thiz, jlong groupId, jint channels) { (void)env; (void)thiz; - return (utun_bridge_radio_audio_start((uint64_t)groupId, (int)channels) == 0) ? JNI_TRUE : JNI_FALSE; + struct bridge_query query = {.kind = QUERY_RADIO_START, .node = (uint64_t)groupId, .limit = channels, .number = -1}; + return !bridge_query_call(&query) && !query.number ? JNI_TRUE : JNI_FALSE; } JNIEXPORT jboolean JNICALL Java_com_utun_chat_data_NativeLib_nativeRadioCaptureStart( diff --git a/tools/chatgui-android/jni_bridge/android_jni_bridge.h b/tools/chatgui-android/jni_bridge/android_jni_bridge.h index c7541511a..ab617a5a7 100644 --- a/tools/chatgui-android/jni_bridge/android_jni_bridge.h +++ b/tools/chatgui-android/jni_bridge/android_jni_bridge.h @@ -1,8 +1,9 @@ /* * C API Android bridge; JNI-точки входа Kotlin находятся в .c под __ANDROID__ и не все входят в этот заголовок. * NDK собирает bridge с общим ядром в libutun.so. Команды обычно ставятся в uasync, готовность/результат приходят событиями. - * Синхронные getters читают SQLite/живые структуры в вызывающем потоке; set_member_nick также пишет SQLite напрямую. - * Внешний владелец сериализует такие вызовы и команды по сырым handles с stop/restart; getter не удерживает instance. + * C getters читают SQLite/живые структуры только в потоке владельца; JNI запрашивает их через instance_lite_call. + * Команды публикуются через instance_lite_post с защитой времени жизни worker и освобождением данных при отмене. + * JSON/getters могут ждать worker: frontend выполняет тяжёлые чтения на IO, не удерживая нужные worker блокировки. * Все char* JSON-результаты принадлежат caller (u_free); при ошибке возможны []/{}, при OOM также NULL. * channel_id — десятичная NUL-строка; conv_id — ID DM без dm:. Префикс dm: нужен только voice/video target. * reply_to в send/voice/photo/video для канала — обязательный указатель на 32 байта (нули = без ответа).