Fix sync auth and reconnects

This commit is contained in:
waozi authored and Waozi committed 2026-07-11 18:49:15 -03:00
1 parent 100be8648b
commit ff2478bb4f
21 files changed
+1626 -169

No files matched your search

+13 -9
View File
@@ -6,6 +6,7 @@ ANDROID_APP_ID := xyz.waozi.inbe
ANDROID_ACTIVITY := xyz.waozi.inbe.MainActivity
CC ?= gcc
CMAKE ?= $(shell if [ -x /usr/bin/cmake ]; then echo /usr/bin/cmake; else command -v cmake; fi)
GRADLE ?= gradle
ARCH := $(shell uname -m)
ANDROID_KEYSTORE ?= $(HOME)/.android/flint-release.keystore
@@ -161,12 +162,12 @@ APPIMAGE_TARGET := $(LINUX_DIST_DIR)/$(APPIMAGE_NAME)
LINUXDEPLOY ?= linuxdeploy
WEB_CC ?= emcc
WEB_AR ?= emar
WEB_CACHE_BUSTER ?= $(shell git rev-parse --short HEAD 2>/dev/null || date +%s)
WEB_CACHE_BUSTER ?= $(shell if git diff --quiet --ignore-submodules HEAD -- 2>/dev/null; then git rev-parse --short HEAD 2>/dev/null; else date +%s; fi)
WEB_TARGET := $(WEB_DIST_DIR)/index.html
WEB_DIST_ZIP := $(BUILD_DIST_DIR)/$(APP_NAME)-web.zip
WEB_ASSET_FILES := $(shell find web-assets -type f 2>/dev/null)
UNPACKAGED_AUDIO_DIR := unpackaged_assets/audio
WEB_AUDIO_FILES := $(shell find $(UNPACKAGED_AUDIO_DIR) -type f 2>/dev/null)
UNPACKAGED_AUDIO_FILES := $(shell find $(UNPACKAGED_AUDIO_DIR) -type f 2>/dev/null)
MEDITATION_AUDIO_ZIP := web-assets/dl/inbe-meditation-audio-v1.zip
.PHONY: all native run test dist appimage clean clean-linux clean-raylib android-check-keystore android-copy-assets android-debug android-release android-bundle android-install android-install-release android-clean package-unpackaged-assets windows-runtime-assets-check windows windows64 windows32 web
@@ -334,16 +335,16 @@ $(SQLITE_AMALGAMATION_C) $(SQLITE_AMALGAMATION_H): $(SQLITE_DIR)/configure $(SQL
$(MAKE) -C $(SQLITE_BUILD_DIR) sqlite3.c sqlite3.h
$(LIBOQS_A): $(LIBOQS_DIR)/CMakeLists.txt | $(BUILD_OBJ_DIR)
cmake -S $(LIBOQS_DIR) -B $(LIBOQS_BUILD_DIR) \
$(CMAKE) -S $(LIBOQS_DIR) -B $(LIBOQS_BUILD_DIR) \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DBUILD_SHARED_LIBS=OFF \
-DOQS_BUILD_ONLY_LIB=ON \
-DOQS_USE_OPENSSL=OFF \
-DOQS_MINIMAL_BUILD=SIG_ml_dsa_44
cmake --build $(LIBOQS_BUILD_DIR) --target oqs
$(CMAKE) --build $(LIBOQS_BUILD_DIR) --target oqs
$(WEB_LIBOQS_A): $(LIBOQS_DIR)/CMakeLists.txt | $(BUILD_OBJ_DIR)
emcmake cmake -S $(LIBOQS_DIR) -B $(WEB_LIBOQS_BUILD_DIR) \
emcmake $(CMAKE) -S $(LIBOQS_DIR) -B $(WEB_LIBOQS_BUILD_DIR) \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DBUILD_SHARED_LIBS=OFF \
-DOQS_BUILD_ONLY_LIB=ON \
@@ -351,7 +352,7 @@ $(WEB_LIBOQS_A): $(LIBOQS_DIR)/CMakeLists.txt | $(BUILD_OBJ_DIR)
-DOQS_DIST_BUILD=OFF \
-DOQS_OPT_TARGET=generic \
-DOQS_MINIMAL_BUILD=SIG_ml_dsa_44
cmake --build $(WEB_LIBOQS_BUILD_DIR) --target oqs
$(CMAKE) --build $(WEB_LIBOQS_BUILD_DIR) --target oqs
$(TARGET): Makefile $(SRC) $(FLINT_SRCS) $(SQLITE_SRC) $(SQLITE_AMALGAMATION_H) $(FONT_OUTPUTS) $(EMBEDDED_ASSETS_C) $(RAYLIB_A) $(LIBOQS_A) | $(LINUX_BIN_DIR)
$(CC) $(CFLAGS) \
@@ -443,7 +444,8 @@ $(APPIMAGE_TARGET): $(TARGET) $(LINUX_APPIMAGE_APPRUN) $(LINUX_APPIMAGE_DESKTOP)
--output appimage
test -f $@
$(WEB_TARGET): Makefile $(SRC) $(FLINT_WEB_SRCS) $(SQLITE_SRC) $(SQLITE_AMALGAMATION_H) $(FONT_OUTPUTS) $(EMBEDDED_ASSETS_C) $(WEB_RAYLIB_A) $(WEB_LIBOQS_A) src/web_shell.html manifest.json $(WEB_ASSET_FILES) $(WEB_AUDIO_FILES) | $(WEB_DIST_DIR)
$(WEB_TARGET): Makefile $(SRC) $(FLINT_WEB_SRCS) $(SQLITE_SRC) $(SQLITE_AMALGAMATION_H) $(FONT_OUTPUTS) $(EMBEDDED_ASSETS_C) $(WEB_RAYLIB_A) $(WEB_LIBOQS_A) src/web_shell.html manifest.json $(WEB_ASSET_FILES) $(MEDITATION_AUDIO_ZIP) | $(WEB_DIST_DIR)
rm -f $(WEB_DIST_DIR)/index.data
$(WEB_CC) $(WEB_CFLAGS) \
$(APP_INCLUDE) \
$(FLINT_INCLUDE) \
@@ -466,7 +468,7 @@ $(WEB_TARGET): Makefile $(SRC) $(FLINT_WEB_SRCS) $(SQLITE_SRC) $(SQLITE_AMALGAMA
-sFORCE_FILESYSTEM=1 \
-sFETCH=1 \
-sALLOW_MEMORY_GROWTH=1 \
--preload-file $(UNPACKAGED_AUDIO_DIR)@$(UNPACKAGED_AUDIO_DIR) \
-sSTACK_SIZE=8388608 \
--shell-file src/web_shell.html \
-lidbfs.js \
-lm
@@ -595,11 +597,13 @@ android-clean:
$(GRADLE) -p droid clean
rm -rf $(ANDROID_BUILD_DIR)
package-unpackaged-assets:
$(MEDITATION_AUDIO_ZIP): $(UNPACKAGED_AUDIO_FILES)
mkdir -p $(dir $(MEDITATION_AUDIO_ZIP))
rm -f $(MEDITATION_AUDIO_ZIP)
cd $(UNPACKAGED_AUDIO_DIR) && find . -mindepth 2 -type f -name '*.ogg' -exec zip -9 -r $(abspath $(MEDITATION_AUDIO_ZIP)) {} + && zip -9 -r $(abspath $(MEDITATION_AUDIO_ZIP)) LICENSE.md MANIFEST.txt
package-unpackaged-assets: $(MEDITATION_AUDIO_ZIP)
windows-runtime-assets-check:
@:
+8 -2
View File
@@ -5,7 +5,7 @@ plugins {
android {
namespace 'xyz.waozi.inbe'
compileSdk 35
ndkVersion "25.1.8937393"
ndkVersion "28.2.13676358"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
@@ -33,7 +33,7 @@ android {
}
defaultConfig {
minSdk 19
minSdk 21
targetSdk 35
versionCode 36
versionName "1.4.1"
@@ -69,6 +69,12 @@ android {
dependenciesInfo {
includeInApk = false
}
packaging {
jniLibs {
useLegacyPackaging = false
}
}
}
gradle.taskGraph.whenReady { taskGraph ->
+1
View File
@@ -176,6 +176,7 @@ target_compile_options(main PRIVATE
target_link_options(main PRIVATE
-Wl,--gc-sections
-Wl,--strip-all
-Wl,-z,max-page-size=16384
-Wl,--wrap=fopen
)
@@ -347,7 +347,7 @@ public class MainActivity extends NativeActivity {
return output.toByteArray();
}
public void openImportPicker() {
public void openImportPicker(final String mimeTypesCsv) {
runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -355,14 +355,10 @@ public class MainActivity extends NativeActivity {
Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
intent.addCategory(Intent.CATEGORY_OPENABLE);
intent.setType("*/*");
intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[] {
"application/zip",
"application/x-zip-compressed",
"application/vnd.sqlite3",
"application/x-sqlite",
"application/x-sqlite3",
"application/octet-stream"
});
String[] mimeTypes = parseMimeTypes(mimeTypesCsv);
if (mimeTypes.length > 0) {
intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
}
startActivityForResult(intent, REQUEST_IMPORT_ZIP);
} catch (Exception e) {
Log.e(TAG, "Failed to open import picker", e);
@@ -372,6 +368,22 @@ public class MainActivity extends NativeActivity {
});
}
private static String[] parseMimeTypes(String mimeTypesCsv) {
if (mimeTypesCsv == null || mimeTypesCsv.trim().isEmpty()) {
return new String[0];
}
String[] raw = mimeTypesCsv.split(",");
java.util.ArrayList<String> result = new java.util.ArrayList<>();
for (String mimeType : raw) {
String trimmed = mimeType.trim();
if (!trimmed.isEmpty()) {
result.add(trimmed);
}
}
return result.toArray(new String[0]);
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
+1 -2
View File
@@ -64,7 +64,7 @@
buildToolsVersions = [ "34.0.0" ];
platformVersions = [ "34" "35" ];
includeNDK = true;
ndkVersions = [ "25.1.8937393" ];
ndkVersions = [ "28.2.13676358" ];
cmakeVersions = [ "3.22.1" ];
includeEmulator = true;
includeSystemImages = true;
@@ -273,7 +273,6 @@ EOF
if [ -d "$project/droid" ]; then
cat > "$project/droid/local.properties" <<EOF
sdk.dir=$ANDROID_SDK_ROOT
ndk.dir=$ANDROID_NDK_ROOT
cmake.dir=$ANDROID_SDK_ROOT/cmake/3.22.1
EOF
fi
+2
View File
@@ -37,12 +37,14 @@ int flint_file_dialog_save(FlintFileDialog *dlg, const char *title, const char *
/* Load file dialog - returns 1 if file selected, 0 if cancelled */
int flint_file_dialog_load(FlintFileDialog *dlg, const char *title);
int flint_file_dialog_load_filtered(FlintFileDialog *dlg, const char *title, const char *filter);
/* Select folder dialog - returns 1 if folder selected, 0 if cancelled */
int flint_file_dialog_select_folder(FlintFileDialog *dlg, const char *title);
/* Begin non-blocking dialogs. Call flint_file_dialog_update() each frame while active. */
void flint_file_dialog_begin_load(FlintFileDialog *dlg, const char *title);
void flint_file_dialog_begin_load_filtered(FlintFileDialog *dlg, const char *title, const char *filter);
void flint_file_dialog_begin_save(FlintFileDialog *dlg, const char *title, const char *default_filename);
/* Draw/update active dialog: 1 confirmed, 0 cancelled, -1 still active. */
+14 -2
View File
@@ -762,7 +762,7 @@ run_dialog(FlintFileDialog *dlg)
}
void
flint_file_dialog_begin_load(FlintFileDialog *dlg, const char *title)
flint_file_dialog_begin_load_filtered(FlintFileDialog *dlg, const char *title, const char *filter)
{
FlintFileDialogInternal *internal;
@@ -770,7 +770,7 @@ flint_file_dialog_begin_load(FlintFileDialog *dlg, const char *title)
flint_file_dialog_init(dlg);
dlg->mode = FLINT_FILE_DIALOG_LOAD;
copy_text(dlg->title, sizeof(dlg->title), title);
copy_text(dlg->filter, sizeof(dlg->filter), ".db,.zip");
copy_text(dlg->filter, sizeof(dlg->filter), filter != NULL ? filter : "");
dlg->active = 1;
dlg->confirmed = 0;
@@ -784,6 +784,18 @@ flint_file_dialog_begin_load(FlintFileDialog *dlg, const char *title)
internal->focus_area = 0;
}
void
flint_file_dialog_begin_load(FlintFileDialog *dlg, const char *title)
{
flint_file_dialog_begin_load_filtered(dlg, title, NULL);
}
int flint_file_dialog_load_filtered(FlintFileDialog *dlg, const char *title, const char *filter) {
if(!dlg || !title) return 0;
flint_file_dialog_begin_load_filtered(dlg, title, filter);
return run_dialog(dlg);
}
int flint_file_dialog_load(FlintFileDialog *dlg, const char *title) {
if(!dlg || !title) return 0;
flint_file_dialog_begin_load(dlg, title);
+288 -15
View File
@@ -8,6 +8,7 @@
#include "practices/practice_registry.h"
#include "device_preferences.h"
#include "storage.h"
#include "sync_account.h"
#include "sync_client.h"
#include "theme.h"
#include "version.h"
@@ -26,6 +27,9 @@
#if defined(PLATFORM_WEB)
#include <emscripten.h>
#elif !defined(_WIN32)
#include <pthread.h>
#define INBE_NATIVE_SYNC_THREAD 1
#endif
#ifdef __ANDROID__
@@ -38,7 +42,8 @@ void set_global_inbe_app(InbeApp *app);
#define INBE_DEFAULT_WIDTH 320
#define INBE_DEFAULT_HEIGHT 560
#define INBE_SYNC_SERVER_URL_KEY "sync_server_url"
#define INBE_SYNC_ENABLED_KEY "sync_enabled"
#define INBE_SYNC_POLL_SECONDS 2.0
#define INBE_SYNC_DIRTY_DELAY_SECONDS 0.15
InbeConfig config = {
.title = "Inner Breeze",
@@ -48,27 +53,245 @@ InbeConfig config = {
.title_custom = 1
};
static double g_next_sync_poll = 0.0;
static double g_dirty_sync_at = 0.0;
static int g_sync_running = 0;
static int g_sync_refresh_pending = 0;
#if defined(INBE_NATIVE_SYNC_THREAD)
typedef struct InbeSyncWorkerArgs {
char url[256];
} InbeSyncWorkerArgs;
static pthread_mutex_t g_sync_mutex = PTHREAD_MUTEX_INITIALIZER;
static int g_sync_finished = 0;
static int g_sync_finished_result = INBE_SYNC_CLIENT_OK;
static int g_sync_finished_changed = 0;
static void *
inbe_app_sync_worker(void *userdata)
{
InbeSyncWorkerArgs *args = userdata;
InbeSyncClientResult result = INBE_SYNC_CLIENT_INVALID_URL;
int changed = 0;
if(args != NULL) {
result = inbe_sync_client_sync(args->url);
changed = result == INBE_SYNC_CLIENT_OK && inbe_storage_last_sync_changed();
free(args);
}
pthread_mutex_lock(&g_sync_mutex);
g_sync_finished_result = result;
g_sync_finished_changed = changed;
g_sync_finished = 1;
g_sync_running = 0;
pthread_mutex_unlock(&g_sync_mutex);
return NULL;
}
static void
inbe_app_collect_finished_sync(void)
{
int finished;
int result;
int changed;
pthread_mutex_lock(&g_sync_mutex);
finished = g_sync_finished;
result = g_sync_finished_result;
changed = g_sync_finished_changed;
g_sync_finished = 0;
pthread_mutex_unlock(&g_sync_mutex);
if(!finished)
return;
if(result == INBE_SYNC_CLIENT_OK) {
TraceLog(LOG_INFO, "SYNC: background sync complete changed=%d", changed);
if(changed)
g_sync_refresh_pending = 1;
} else {
TraceLog(LOG_WARNING, "SYNC: background sync failed result=%d name=%s",
result, inbe_sync_client_result_name(result));
}
}
#else
static void
inbe_app_collect_finished_sync(void)
{
}
#endif
static int
inbe_app_background_sync_safe(const InbeApp *app)
{
if(app == NULL)
return 0;
if(app->modal.active || app->habit_edit_active || app->habit_session_edit_active)
return 0;
if(app->inbe.screen == InbeScreenSession ||
app->inbe.screen == InbeScreenMeditation ||
app->inbe.screen == InbeScreenHabitEdit ||
app->inbe.screen == InbeScreenHabitSessionEdit)
return 0;
return 1;
}
static void
inbe_app_apply_pending_sync_refresh(InbeApp *app)
{
if(!g_sync_refresh_pending || !inbe_app_background_sync_safe(app))
return;
g_sync_refresh_pending = 0;
#if defined(PLATFORM_WEB)
(void)app;
return;
#else
TraceLog(LOG_INFO, "SYNC: applying remote refresh");
app_reload_after_import(app, 0);
#endif
}
static int
inbe_app_sync_url(char *url, size_t url_size)
{
const char *saved_url;
InbeSyncAccount account;
if(url == NULL || url_size == 0)
return 0;
url[0] = '\0';
if(!inbe_sync_account_load(&account))
return 0;
saved_url = inbe_storage_get_setting_text(INBE_SYNC_SERVER_URL_KEY);
if(!inbe_sync_client_normalize_url(saved_url, url, url_size))
return 0;
return 1;
}
static int
inbe_app_sync_now(InbeApp *app)
{
char url[256];
if(app == NULL || !inbe_app_sync_url(url, sizeof(url)))
return 0;
#if defined(INBE_NATIVE_SYNC_THREAD)
{
pthread_t thread;
InbeSyncWorkerArgs *args;
pthread_mutex_lock(&g_sync_mutex);
if(g_sync_running) {
pthread_mutex_unlock(&g_sync_mutex);
return 0;
}
g_sync_running = 1;
pthread_mutex_unlock(&g_sync_mutex);
args = malloc(sizeof(*args));
if(args == NULL) {
pthread_mutex_lock(&g_sync_mutex);
g_sync_running = 0;
pthread_mutex_unlock(&g_sync_mutex);
return 0;
}
snprintf(args->url, sizeof(args->url), "%s", url);
TraceLog(LOG_INFO, "SYNC: starting background sync");
if(pthread_create(&thread, NULL, inbe_app_sync_worker, args) != 0) {
free(args);
pthread_mutex_lock(&g_sync_mutex);
g_sync_running = 0;
pthread_mutex_unlock(&g_sync_mutex);
TraceLog(LOG_WARNING, "SYNC: failed to start background sync thread");
return 0;
}
pthread_detach(thread);
return 1;
}
#else
InbeSyncClientResult result;
if(g_sync_running)
return 0;
g_sync_running = 1;
TraceLog(LOG_INFO, "SYNC: starting sync");
result = inbe_sync_client_sync(url);
g_sync_running = 0;
if(result != INBE_SYNC_CLIENT_OK) {
TraceLog(LOG_WARNING, "SYNC: sync failed result=%d name=%s",
result, inbe_sync_client_result_name(result));
return 0;
}
TraceLog(LOG_INFO, "SYNC: sync complete changed=%d", inbe_storage_last_sync_changed());
if(inbe_storage_last_sync_changed())
g_sync_refresh_pending = 1;
return 1;
#endif
}
int
inbe_app_auto_sync(InbeApp *app)
{
const char *saved_url;
double due;
double now;
char url[256];
InbeSyncClientResult result;
if(app == NULL || !inbe_app_sync_url(url, sizeof(url)))
return 0;
#if defined(PLATFORM_WEB)
(void)url;
return 0;
#endif
now = GetTime();
if(inbe_app_background_sync_safe(app) && inbe_app_sync_now(app)) {
g_next_sync_poll = now + INBE_SYNC_POLL_SECONDS;
g_dirty_sync_at = 0.0;
TraceLog(LOG_INFO, "SYNC: dispatched local changes");
return 1;
}
due = now + INBE_SYNC_DIRTY_DELAY_SECONDS;
if(g_dirty_sync_at <= 0.0 || due < g_dirty_sync_at)
g_dirty_sync_at = due;
TraceLog(LOG_INFO, "SYNC: queued local changes");
return 1;
}
static void
inbe_app_poll_remote_sync(InbeApp *app)
{
double now;
int should_sync = 0;
if(app == NULL)
return 0;
if(inbe_storage_get_setting_int(INBE_SYNC_ENABLED_KEY, 0) == 0)
return 0;
saved_url = inbe_storage_get_setting_text(INBE_SYNC_SERVER_URL_KEY);
if(!inbe_sync_client_normalize_url(saved_url, url, sizeof(url)))
return 0;
result = inbe_sync_client_sync(url);
if(result != INBE_SYNC_CLIENT_OK) {
TraceLog(LOG_WARNING, "INBE: auto sync failed result=%d", result);
return 0;
return;
inbe_app_collect_finished_sync();
inbe_app_apply_pending_sync_refresh(app);
#if defined(PLATFORM_WEB)
return;
#endif
now = GetTime();
if(g_next_sync_poll <= 0.0)
g_next_sync_poll = now + 0.25;
if(g_dirty_sync_at > 0.0 && now >= g_dirty_sync_at) {
should_sync = 1;
g_dirty_sync_at = 0.0;
} else if(now >= g_next_sync_poll) {
should_sync = 1;
}
TraceLog(LOG_INFO, "INBE: auto sync complete");
return 1;
if(!should_sync)
return;
if(!inbe_app_background_sync_safe(app)) {
TraceLog(LOG_INFO, "SYNC: delayed; app is active");
if(g_dirty_sync_at <= 0.0)
g_dirty_sync_at = now + 1.0;
g_next_sync_poll = now + 1.0;
return;
}
g_next_sync_poll = now + INBE_SYNC_POLL_SECONDS;
if(inbe_app_sync_now(app))
TraceLog(LOG_INFO, "SYNC: dispatched");
inbe_app_apply_pending_sync_refresh(app);
}
int view_width = INBE_DEFAULT_WIDTH;
@@ -473,9 +696,32 @@ int_from_count(const char src[CountSize])
void
app_reload_after_import(InbeApp *app, int reload_settings)
{
char selected_habit_id[INBE_HABIT_ID_SIZE] = "";
char detail_habit_id[INBE_HABIT_ID_SIZE] = "";
int selected = -1;
int detail_index = -1;
int view_mode = HABIT_VIEW_CALENDAR;
int month_offset = 0;
int scroll = 0;
int weekly_days = 0;
if(app == NULL)
return;
if(!reload_settings) {
if(app->habits.selected >= 0 && app->habits.selected < app->habits.count)
snprintf(selected_habit_id, sizeof(selected_habit_id), "%s",
app->habits.items[app->habits.selected].id);
if(app->habit_detail_index >= 0 && app->habit_detail_index < app->habits.count)
snprintf(detail_habit_id, sizeof(detail_habit_id), "%s",
app->habits.items[app->habit_detail_index].id);
selected = app->habits.selected;
detail_index = app->habit_detail_index;
view_mode = app->habits.view_mode;
month_offset = app->habits.month_offset;
scroll = app->habits.scroll;
weekly_days = app->habits.weekly_days;
}
if(reload_settings) {
if(app_load_settings(app))
save_settings(app);
@@ -484,6 +730,32 @@ app_reload_after_import(InbeApp *app, int reload_settings)
}
inbe_habits_init(&app->habits);
if(!reload_settings) {
app->habits.selected = -1;
for(int i = 0; i < app->habits.count; i++) {
if(selected_habit_id[0] != '\0' &&
strcmp(app->habits.items[i].id, selected_habit_id) == 0) {
app->habits.selected = i;
break;
}
}
if(app->habits.selected < 0 && selected >= 0 && selected < app->habits.count)
app->habits.selected = selected;
app->habit_detail_index = -1;
for(int i = 0; i < app->habits.count; i++) {
if(detail_habit_id[0] != '\0' &&
strcmp(app->habits.items[i].id, detail_habit_id) == 0) {
app->habit_detail_index = i;
break;
}
}
if(app->habit_detail_index < 0 && detail_index >= 0 && detail_index < app->habits.count)
app->habit_detail_index = detail_index;
app->habits.view_mode = view_mode;
app->habits.month_offset = month_offset;
app->habits.scroll = scroll;
app->habits.weekly_days = weekly_days;
}
if(app->habit_detail_index >= app->habits.count)
app->habit_detail_index = -1;
if(app->habits.selected < 0 || app->habits.selected >= app->habits.count)
@@ -1081,6 +1353,7 @@ inbe_app_update_draw(void *vapp, Rectangle viewport) {
ui_set_cursor_disabled(&app->cursor_disabled);
app_device_preferences_update(app);
app_refresh_theme(app);
inbe_app_poll_remote_sync(app);
DrawRectangleRec(viewport, theme_get_bg());
flint_clip_begin((int)viewport.x, (int)viewport.y, (int)viewport.width, (int)viewport.height);
+14 -4
View File
@@ -31,7 +31,7 @@ android_import_set_result(int result, const char *path)
}
int
android_import_open_picker(void)
android_import_open_picker(const char *mime_types)
{
struct android_app *app = GetAndroidApp();
if(app == NULL || app->activity == NULL) {
@@ -55,14 +55,23 @@ android_import_open_picker(void)
return 0;
}
jmethodID method = (*env)->GetMethodID(env, activity_class, "openImportPicker", "()V");
jmethodID method = (*env)->GetMethodID(env, activity_class, "openImportPicker",
"(Ljava/lang/String;)V");
if(method == NULL) {
TraceLog(LOG_ERROR, "ANDROID_IMPORT: openImportPicker method not found");
(*jvm)->DetachCurrentThread(jvm);
return 0;
}
(*env)->CallVoidMethod(env, activity->clazz, method);
jstring mime_string = (*env)->NewStringUTF(env, mime_types != NULL ? mime_types : "");
if(mime_string == NULL) {
TraceLog(LOG_ERROR, "ANDROID_IMPORT: failed to allocate MIME string");
(*jvm)->DetachCurrentThread(jvm);
return 0;
}
(*env)->CallVoidMethod(env, activity->clazz, method, mime_string);
(*env)->DeleteLocalRef(env, mime_string);
if((*env)->ExceptionCheck(env)) {
(*env)->ExceptionDescribe(env);
(*env)->ExceptionClear(env);
@@ -124,8 +133,9 @@ android_import_poll_result(char *path, size_t path_size)
#else
int
android_import_open_picker(void)
android_import_open_picker(const char *mime_types)
{
(void)mime_types;
return 0;
}
+1 -1
View File
@@ -3,7 +3,7 @@
#include <stddef.h>
int android_import_open_picker(void);
int android_import_open_picker(const char *mime_types);
int android_import_poll_result(char *path, size_t path_size);
enum {
@@ -306,7 +306,11 @@ music_track_path(InbeApp *app, int track, char *out, size_t out_size)
file_exists(out))
return;
#if defined(PLATFORM_WEB)
out[0] = '\0';
#else
snprintf(out, out_size, "unpackaged_assets/audio/%s", g_tracks[track].file);
#endif
}
static int
-2
View File
@@ -973,7 +973,6 @@ draw_habits_top_bar(InbeApp *app, int draw_menu)
app->habits.scroll = 0;
app->habits.weekly_days = HABIT_WEEKLY_INITIAL_DAYS;
}
inbe_habits_save(&app->habits);
}
if(!app->modal.active && app->habits.count > 0) {
@@ -1010,7 +1009,6 @@ draw_habits_top_bar(InbeApp *app, int draw_menu)
app->habits.scroll = 0;
app->habits.weekly_days = HABIT_WEEKLY_INITIAL_DAYS;
}
inbe_habits_save(&app->habits);
}
}
+55 -13
View File
@@ -40,10 +40,16 @@ enum {
#define INBE_SYNC_SERVER_URL_KEY "sync_server_url"
#define INBE_SYNC_SERVER_URL_DEFAULT "https://api.waozi.xyz"
#define SETTINGS_DATA_IMPORT_FILTER ".db,.zip"
#define SETTINGS_SYNC_KEY_IMPORT_FILTER ".key"
#define SETTINGS_ANDROID_DATA_IMPORT_MIME_TYPES "application/zip,application/x-zip-compressed,application/vnd.sqlite3,application/x-sqlite,application/x-sqlite3,application/octet-stream"
#define SETTINGS_ANDROID_SYNC_KEY_IMPORT_MIME_TYPES "*/*"
#if defined(INBE_HAS_FLINT_FILE_DIALOG)
static FlintFileDialog export_dlg;
static FlintFileDialog import_dlg;
#endif
#if defined(INBE_HAS_FLINT_FILE_DIALOG) || defined(PLATFORM_ANDROID) || defined(__ANDROID__) || defined(ANDROID)
static int data_file_dialog_action = SETTINGS_DATA_ACTION_NONE;
#endif
@@ -277,11 +283,12 @@ settings_start_sync_key_import_dialog(InbeApp *app)
(void)app;
EM_ASM({
const importPath = UTF8ToString($0);
const accept = UTF8ToString($1);
Module.__inbeSyncKeyImportResult = 0;
const input = document.createElement("input");
input.type = "file";
input.accept = ".key,text/plain,application/octet-stream";
input.accept = accept;
input.style.display = "none";
input.onchange = async function() {
@@ -294,9 +301,12 @@ settings_start_sync_key_import_dialog(InbeApp *app)
const file = input.files[0];
const bytes = new Uint8Array(await file.arrayBuffer());
try {
FS.mkdir("/tmp");
FS.mkdirTree("/tmp");
} catch(e) {}
FS.writeFile("/tmp/inbe-sync-key-import.key", bytes);
try {
FS.unlink(importPath);
} catch(e) {}
FS.writeFile(importPath, bytes);
Module.__inbeSyncKeyImportResult = 1;
} catch(e) {
console.error("Inbe sync key import failed:", e);
@@ -308,12 +318,22 @@ settings_start_sync_key_import_dialog(InbeApp *app)
document.body.appendChild(input);
input.click();
}, "/tmp/inbe-sync-key-import.key");
}, "/tmp/inbe-sync-key-import.key", SETTINGS_SYNC_KEY_IMPORT_FILTER);
settings_screen_set_status_success(locale_get("sync_import_key_dialog_title"), NULL);
return 1;
#elif defined(PLATFORM_ANDROID) || defined(__ANDROID__) || defined(ANDROID)
(void)app;
data_file_dialog_action = SETTINGS_DATA_ACTION_SYNC_KEY_IMPORT;
if(android_import_open_picker(SETTINGS_ANDROID_SYNC_KEY_IMPORT_MIME_TYPES)) {
settings_screen_set_status_success(locale_get("sync_import_key_dialog_title"), NULL);
return 1;
}
data_file_dialog_action = SETTINGS_DATA_ACTION_NONE;
return 0;
#elif defined(INBE_HAS_FLINT_FILE_DIALOG)
settings_apply_file_dialog_theme(app);
flint_file_dialog_begin_load(&import_dlg, locale_get("sync_import_key_dialog_title"));
flint_file_dialog_begin_load_filtered(&import_dlg, locale_get("sync_import_key_dialog_title"),
SETTINGS_SYNC_KEY_IMPORT_FILTER);
data_file_dialog_action = SETTINGS_DATA_ACTION_SYNC_KEY_IMPORT;
return 1;
#else
@@ -429,14 +449,26 @@ settings_data_handle_android_import(InbeApp *app)
if(import_result == ANDROID_IMPORT_RESULT_NONE)
return;
if(import_result == ANDROID_IMPORT_RESULT_CANCELLED) {
settings_screen_set_status_error(locale_get("import_cancelled"));
if(data_file_dialog_action == SETTINGS_DATA_ACTION_SYNC_KEY_IMPORT)
settings_screen_set_status_error(locale_get("sync_private_key_import_cancelled"));
else
settings_screen_set_status_error(locale_get("import_cancelled"));
data_file_dialog_action = SETTINGS_DATA_ACTION_NONE;
return;
}
if(import_path[0] == '\0') {
settings_screen_set_status_error(locale_get("import_invalid_file"));
if(data_file_dialog_action == SETTINGS_DATA_ACTION_SYNC_KEY_IMPORT)
settings_screen_set_status_error(locale_get("sync_private_key_import_failed"));
else
settings_screen_set_status_error(locale_get("import_invalid_file"));
data_file_dialog_action = SETTINGS_DATA_ACTION_NONE;
return;
}
settings_begin_import_for_path(app, import_path);
if(data_file_dialog_action == SETTINGS_DATA_ACTION_SYNC_KEY_IMPORT)
settings_import_sync_key_path(app, import_path);
else
settings_begin_import_for_path(app, import_path);
data_file_dialog_action = SETTINGS_DATA_ACTION_NONE;
}
#else
void settings_data_handle_android_import(InbeApp *app) { (void)app; }
@@ -468,7 +500,10 @@ settings_web_import_open_picker(void)
const file = input.files[0];
const bytes = new Uint8Array(await file.arrayBuffer());
try {
FS.mkdir("/tmp");
FS.mkdirTree("/tmp");
} catch(e) {}
try {
FS.unlink(importPath);
} catch(e) {}
FS.writeFile(importPath, bytes);
Module.__inbeImportResult = 1;
@@ -530,17 +565,21 @@ static void
settings_import_data(InbeApp *app)
{
#if defined(PLATFORM_ANDROID) || defined(__ANDROID__) || defined(ANDROID)
if(android_import_open_picker())
data_file_dialog_action = SETTINGS_DATA_ACTION_IMPORT;
if(android_import_open_picker(SETTINGS_ANDROID_DATA_IMPORT_MIME_TYPES))
settings_screen_set_status_success(locale_get("import_data_dialog_title"), NULL);
else
else {
data_file_dialog_action = SETTINGS_DATA_ACTION_NONE;
settings_screen_set_status_error(locale_get("import_failed"));
}
#elif defined(PLATFORM_WEB)
(void)app;
settings_web_import_open_picker();
settings_screen_set_status_success(locale_get("import_data_dialog_title"), NULL);
#elif defined(INBE_HAS_FLINT_FILE_DIALOG)
settings_apply_file_dialog_theme(app);
flint_file_dialog_begin_load(&import_dlg, locale_get("import_data_dialog_title"));
flint_file_dialog_begin_load_filtered(&import_dlg, locale_get("import_data_dialog_title"),
SETTINGS_DATA_IMPORT_FILTER);
data_file_dialog_action = SETTINGS_DATA_ACTION_IMPORT;
#else
(void)app;
@@ -620,7 +659,10 @@ settings_data_draw_pending_file_dialog(InbeApp *app)
return 0;
settings_apply_file_dialog_theme(app);
dlg = data_file_dialog_action == SETTINGS_DATA_ACTION_IMPORT ? &import_dlg : &export_dlg;
dlg = (data_file_dialog_action == SETTINGS_DATA_ACTION_IMPORT ||
data_file_dialog_action == SETTINGS_DATA_ACTION_SYNC_KEY_IMPORT)
? &import_dlg
: &export_dlg;
result = flint_file_dialog_update(dlg);
if(result < 0)
return 1;
+10 -14
View File
@@ -15,8 +15,6 @@
#define INBE_SYNC_SERVER_URL_KEY "sync_server_url"
#define INBE_SYNC_SERVER_URL_DEFAULT "https://api.waozi.xyz"
#define INBE_SYNC_ENABLED_KEY "sync_enabled"
#define INBE_SYNC_CONNECTED_URL_KEY "sync_connected_url"
static SettingsSyncKeySaveDialog save_dialog_callback = NULL;
static SettingsSyncKeyImportDialog import_dialog_callback = NULL;
@@ -108,7 +106,6 @@ static void
settings_sync_server_save(InbeApp *app)
{
char url[sizeof(app->sync_server_url)];
const char *connected_url;
if(app == NULL)
return;
@@ -117,9 +114,6 @@ settings_sync_server_save(InbeApp *app)
return;
}
inbe_storage_set_setting_text(INBE_SYNC_SERVER_URL_KEY, url);
connected_url = inbe_storage_get_setting_text(INBE_SYNC_CONNECTED_URL_KEY);
if(connected_url == NULL || strcmp(connected_url, url) != 0)
inbe_storage_set_setting_int(INBE_SYNC_ENABLED_KEY, 0);
settings_screen_set_status_success(locale_get("sync_server_saved"), url);
}
@@ -127,14 +121,18 @@ static int
settings_sync_server_connected(InbeApp *app)
{
char url[sizeof(app->sync_server_url)];
const char *connected_url;
const char *saved_url;
char saved_normalized[sizeof(app->sync_server_url)];
InbeSyncAccount account;
if(app == NULL || inbe_storage_get_setting_int(INBE_SYNC_ENABLED_KEY, 0) == 0)
if(app == NULL || !inbe_sync_account_load(&account))
return 0;
if(!inbe_sync_client_normalize_url(app->sync_server_url, url, sizeof(url)))
return 0;
connected_url = inbe_storage_get_setting_text(INBE_SYNC_CONNECTED_URL_KEY);
return connected_url != NULL && strcmp(connected_url, url) == 0;
saved_url = inbe_storage_get_setting_text(INBE_SYNC_SERVER_URL_KEY);
if(!inbe_sync_client_normalize_url(saved_url, saved_normalized, sizeof(saved_normalized)))
return 0;
return strcmp(saved_normalized, url) == 0;
}
static const char *
@@ -175,8 +173,7 @@ settings_sync_run_connect(InbeApp *app)
inbe_storage_set_setting_text(INBE_SYNC_SERVER_URL_KEY, url);
result = inbe_sync_client_sync(url);
if(result == INBE_SYNC_CLIENT_OK) {
inbe_storage_set_setting_int(INBE_SYNC_ENABLED_KEY, 1);
inbe_storage_set_setting_text(INBE_SYNC_CONNECTED_URL_KEY, url);
app_reload_after_import(app, 0);
settings_screen_set_status_success(locale_get(settings_sync_result_key(result)), NULL);
} else {
settings_screen_set_status_error(locale_get(settings_sync_result_key(result)));
@@ -206,8 +203,6 @@ settings_sync_account_delete_confirmed(InbeApp *app)
}
inbe_sync_account_clear();
inbe_storage_set_setting_int(INBE_SYNC_ENABLED_KEY, 0);
inbe_storage_set_setting_text(INBE_SYNC_CONNECTED_URL_KEY, "");
settings_screen_set_status_success(locale_get("sync_account_deleted"), NULL);
}
@@ -306,6 +301,7 @@ settings_sync_account_draw_config(InbeApp *app, int x, int w, int *y)
}
if(!has_account) {
*y += flint_px(12);
if(ui_draw_generic_button(x, *y, half_w, btn_h, locale_get("sync_create_account_button"),
UI_BUTTON_STYLE_PRIMARY, 0, &hover)) {
if(inbe_sync_account_create(&account)) {
+670 -73
View File
File diff suppressed because it is too large. Load diff
+4
View File
@@ -63,6 +63,10 @@ long long inbe_storage_delete_all_sessions(void);
char *inbe_storage_build_sync_payload_json(const char *user_id_hash,
const char *public_key_hex);
void inbe_storage_free_sync_payload_json(char *payload);
int inbe_storage_apply_sync_response_json(const char *response_json);
int inbe_storage_last_sync_changed(void);
const char *inbe_storage_sync_client_id(void);
void inbe_storage_reset_sync_state(void);
int inbe_storage_habits_empty(void);
int inbe_storage_habits_load(void *habits);
+92 -6
View File
@@ -2,6 +2,7 @@
#include "data.h"
#include "storage.h"
#include "sync_client.h"
#include "raylib.h"
#if defined(PLATFORM_ANDROID) || defined(__ANDROID__) || defined(ANDROID)
@@ -240,20 +241,88 @@ parse_sync_key_line(InbeSyncAccount *account, const char *line, size_t line_len)
value = line + 12;
value_len = line_len - 12;
copy_key_value(account->private_key_hex, sizeof(account->private_key_hex), value, value_len);
} else if(line_len > 11 && strncmp(line, "secret_key=", 11) == 0) {
value = line + 11;
value_len = line_len - 11;
copy_key_value(account->private_key_hex, sizeof(account->private_key_hex), value, value_len);
}
}
static int
extract_json_string_field(const char *json, const char *field, char *out, size_t out_size)
{
char key[64];
const char *p;
char *dst;
char *end;
if(json == NULL || field == NULL || out == NULL || out_size == 0)
return 0;
out[0] = '\0';
if(strlen(field) + 3 > sizeof(key))
return 0;
snprintf(key, sizeof(key), "\"%s\"", field);
p = strstr(json, key);
if(p == NULL)
return 0;
p += strlen(key);
while(*p == ' ' || *p == '\t' || *p == '\r' || *p == '\n')
p++;
if(*p != ':')
return 0;
p++;
while(*p == ' ' || *p == '\t' || *p == '\r' || *p == '\n')
p++;
if(*p != '"')
return 0;
p++;
dst = out;
end = out + out_size - 1;
while(*p != '\0' && *p != '"' && dst < end) {
if(*p == '\\') {
p++;
if(*p == 'n')
*dst++ = '\n';
else if(*p == 'r')
*dst++ = '\r';
else if(*p == 't')
*dst++ = '\t';
else if(*p == '\\' || *p == '"')
*dst++ = *p;
else
return 0;
if(*p != '\0')
p++;
continue;
}
*dst++ = *p++;
}
*dst = '\0';
return *p == '"';
}
static int
parse_sync_key_text(const char *text, InbeSyncAccount *account)
{
const char *line;
const char *next;
char exported_key[8200];
if(text == NULL || account == NULL)
return 0;
if(extract_json_string_field(text, "exported_key", exported_key, sizeof(exported_key)))
text = exported_key;
memset(account, 0, sizeof(*account));
line = text;
if((unsigned char)line[0] == 0xef &&
(unsigned char)line[1] == 0xbb &&
(unsigned char)line[2] == 0xbf)
line += 3;
while(*line != '\0') {
next = strchr(line, '\n');
if(next == NULL) {
@@ -263,7 +332,8 @@ parse_sync_key_text(const char *text, InbeSyncAccount *account)
parse_sync_key_line(account, line, (size_t)(next - line));
line = next + 1;
}
return account_has_values(account);
return account->public_key_hex[0] != '\0' &&
account->private_key_hex[0] != '\0';
}
static int
@@ -272,15 +342,20 @@ sync_account_validate_import(InbeSyncAccount *account)
uint8_t public_key[1312];
char expected_public_id[65];
if(!account_has_values(account))
if(account == NULL)
return 0;
if(!hex_string_valid(account->public_id, 64) ||
!hex_string_valid(account->public_key_hex, 2624) ||
if(!hex_string_valid(account->public_key_hex, 2624) ||
!hex_string_valid(account->private_key_hex, 5120))
return 0;
if(!hex_to_bytes(account->public_key_hex, public_key, sizeof(public_key)))
return 0;
inbe_sync_sha256_hex(public_key, sizeof(public_key), expected_public_id);
if(account->public_id[0] == '\0') {
snprintf(account->public_id, sizeof(account->public_id), "%s", expected_public_id);
return 1;
}
if(!hex_string_valid(account->public_id, 64))
return 0;
return strcmp(account->public_id, expected_public_id) == 0;
}
@@ -388,6 +463,8 @@ inbe_sync_account_create(InbeSyncAccount *account)
inbe_storage_set_setting_text(SYNC_PUBLIC_ID_KEY, generated.public_id);
inbe_storage_set_setting_text(SYNC_PUBLIC_KEY_KEY, generated.public_key_hex);
inbe_storage_set_setting_text(SYNC_PRIVATE_KEY_KEY, generated.private_key_hex);
inbe_sync_client_clear_auth_token();
inbe_storage_reset_sync_state();
inbe_storage_settings_end_write();
*account = generated;
@@ -412,8 +489,13 @@ inbe_sync_account_import_private_key(InbeSyncAccount *account, const char *filen
if(body == NULL)
return 0;
if(!parse_sync_key_text(body, &imported) ||
!sync_account_validate_import(&imported)) {
if(!parse_sync_key_text(body, &imported)) {
TraceLog(LOG_WARNING, "SYNC: Private key import failed: missing public_key/private_key fields");
UnloadFileText(body);
return 0;
}
if(!sync_account_validate_import(&imported)) {
TraceLog(LOG_WARNING, "SYNC: Private key import failed: invalid key values");
UnloadFileText(body);
return 0;
}
@@ -423,6 +505,8 @@ inbe_sync_account_import_private_key(InbeSyncAccount *account, const char *filen
inbe_storage_set_setting_text(SYNC_PUBLIC_ID_KEY, imported.public_id);
inbe_storage_set_setting_text(SYNC_PUBLIC_KEY_KEY, imported.public_key_hex);
inbe_storage_set_setting_text(SYNC_PRIVATE_KEY_KEY, imported.private_key_hex);
inbe_sync_client_clear_auth_token();
inbe_storage_reset_sync_state();
inbe_storage_settings_end_write();
*account = imported;
@@ -437,6 +521,8 @@ inbe_sync_account_clear(void)
inbe_storage_set_setting_text(SYNC_PUBLIC_ID_KEY, "");
inbe_storage_set_setting_text(SYNC_PUBLIC_KEY_KEY, "");
inbe_storage_set_setting_text(SYNC_PRIVATE_KEY_KEY, "");
inbe_sync_client_clear_auth_token();
inbe_storage_reset_sync_state();
inbe_storage_settings_end_write();
return 1;
}
+234 -17
View File
@@ -7,6 +7,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#if defined(PLATFORM_ANDROID) || defined(__ANDROID__) || defined(ANDROID)
#define INBE_SYNC_CLIENT_HAS_ANDROID 1
@@ -27,7 +28,11 @@ extern struct android_app *GetAndroidApp(void);
#define INBE_SYNC_PATH "/api/v1/sync"
#define INBE_CHALLENGE_PATH "/api/v1/sync/challenge"
#define INBE_LOGIN_PATH "/api/v1/sync/login"
#define INBE_ACCOUNT_DELETE_WITH_KEY_PATH "/api/v1/account/delete-with-key"
#define INBE_SYNC_WEB_RESPONSE_MAX (4 * 1024 * 1024)
#define INBE_SYNC_AUTH_TOKEN_KEY "sync_auth_token"
#define INBE_SYNC_AUTH_TOKEN_EXPIRES_KEY "sync_auth_token_expires_at"
typedef struct SyncBuffer {
char *data;
@@ -35,6 +40,53 @@ typedef struct SyncBuffer {
size_t cap;
} SyncBuffer;
const char *
inbe_sync_client_result_name(InbeSyncClientResult result)
{
switch(result) {
case INBE_SYNC_CLIENT_OK:
return "ok";
case INBE_SYNC_CLIENT_UNAVAILABLE:
return "unavailable";
case INBE_SYNC_CLIENT_INVALID_URL:
return "invalid_url";
case INBE_SYNC_CLIENT_NO_ACCOUNT:
return "no_account";
case INBE_SYNC_CLIENT_PAYLOAD_FAILED:
return "payload_failed";
case INBE_SYNC_CLIENT_CHALLENGE_FAILED:
return "challenge_failed";
case INBE_SYNC_CLIENT_SIGN_FAILED:
return "sign_failed";
case INBE_SYNC_CLIENT_REQUEST_FAILED:
return "request_failed";
case INBE_SYNC_CLIENT_AUTH_FAILED:
return "auth_failed";
default:
return "unknown";
}
}
static void
sync_log_http_failure(const char *step, long status, const char *response)
{
char snippet[161];
size_t len;
if(response == NULL)
response = "";
len = strlen(response);
if(len >= sizeof(snippet))
len = sizeof(snippet) - 1;
memcpy(snippet, response, len);
snippet[len] = '\0';
for(size_t i = 0; i < len; i++) {
if(snippet[i] == '\n' || snippet[i] == '\r' || snippet[i] == '\t')
snippet[i] = ' ';
}
TraceLog(LOG_WARNING, "SYNC: %s failed status=%ld response=%s", step, status, snippet);
}
static int
sync_has_prefix(const char *text, const char *prefix)
{
@@ -254,6 +306,27 @@ sync_find_json_string(const char *json, const char *key, char *out, size_t out_s
return *p == '"' && out[0] != '\0';
}
static long long
sync_find_json_int64(const char *json, const char *key, long long fallback)
{
const char *p;
char pattern[64];
if(json == NULL || key == NULL)
return fallback;
snprintf(pattern, sizeof(pattern), "\"%s\"", key);
p = strstr(json, pattern);
if(p == NULL)
return fallback;
p = strchr(p + strlen(pattern), ':');
if(p == NULL)
return fallback;
p++;
while(*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r')
p++;
return strtoll(p, NULL, 10);
}
#if defined(INBE_SYNC_CLIENT_HAS_CURL)
static size_t
sync_write_callback(void *ptr, size_t size, size_t nmemb, void *userdata)
@@ -484,14 +557,14 @@ sync_http_request(const char *method, const char *url, const char *body,
}
}
response_text = (char *)calloc(1, 65536);
response_text = (char *)calloc(1, INBE_SYNC_WEB_RESPONSE_MAX);
if(response_text == NULL) {
free(header_blob.data);
return 0;
}
ok = sync_web_http_request(method, url, body != NULL ? body : "",
header_blob.data != NULL ? header_blob.data : "",
response_text, 65536, status);
response_text, INBE_SYNC_WEB_RESPONSE_MAX, status);
free(header_blob.data);
if(!ok) {
free(response_text);
@@ -499,7 +572,7 @@ sync_http_request(const char *method, const char *url, const char *body,
}
response->data = response_text;
response->len = strlen(response_text);
response->cap = 65536;
response->cap = INBE_SYNC_WEB_RESPONSE_MAX;
return 1;
}
#endif
@@ -523,6 +596,7 @@ sync_fetch_challenge(const char *base_url, const char *user_id, char nonce_hex[6
if(!ok || status != 200 ||
!sync_find_json_string(response.data, "nonce", nonce_hex, 65) ||
strlen(nonce_hex) != 64) {
sync_log_http_failure("challenge", status, response.data);
free(response.data);
return status == 401 ? INBE_SYNC_CLIENT_AUTH_FAILED : INBE_SYNC_CLIENT_CHALLENGE_FAILED;
}
@@ -531,8 +605,7 @@ sync_fetch_challenge(const char *base_url, const char *user_id, char nonce_hex[6
}
static InbeSyncClientResult
sync_send_signed(const char *base_url, const char *path, const char *method,
const char *user_id, const char *body)
sync_login(const char *base_url, const InbeSyncAccount *account)
{
char nonce_hex[65];
char message[256];
@@ -541,32 +614,160 @@ sync_send_signed(const char *base_url, const char *path, const char *method,
char user_header[96];
char signature_header[5050];
const char *headers[3];
SyncBuffer body = {0};
SyncBuffer response = {0};
long status = 0;
InbeSyncClientResult challenge_result;
int ok;
char token[4096];
long long expires_in;
long long expires_at;
challenge_result = sync_fetch_challenge(base_url, user_id, nonce_hex);
if(account == NULL)
return INBE_SYNC_CLIENT_NO_ACCOUNT;
if(!sync_buffer_append(&body, "{\"user_id_hash\":", strlen("{\"user_id_hash\":")) ||
!sync_buffer_append_json_string(&body, account->public_id) ||
!sync_buffer_append(&body, ",\"client_id\":", strlen(",\"client_id\":")) ||
!sync_buffer_append_json_string(&body, inbe_storage_sync_client_id()) ||
!sync_buffer_append(&body, ",\"public_key\":", strlen(",\"public_key\":")) ||
!sync_buffer_append_json_string(&body, account->public_key_hex) ||
!sync_buffer_append(&body, "}", 1)) {
free(body.data);
return INBE_SYNC_CLIENT_PAYLOAD_FAILED;
}
challenge_result = sync_fetch_challenge(base_url, account->public_id, nonce_hex);
if(challenge_result != INBE_SYNC_CLIENT_OK)
{
free(body.data);
return challenge_result;
if(!sync_build_message(method, path, nonce_hex, body, message, sizeof(message)))
}
if(!sync_build_message("POST", INBE_LOGIN_PATH, nonce_hex, body.data, message, sizeof(message))) {
free(body.data);
return INBE_SYNC_CLIENT_SIGN_FAILED;
}
if(!inbe_sync_account_sign_hex((const uint8_t *)message, strlen(message),
signature_hex, sizeof(signature_hex)))
signature_hex, sizeof(signature_hex))) {
free(body.data);
return INBE_SYNC_CLIENT_SIGN_FAILED;
sync_join_url(url, sizeof(url), base_url, path);
snprintf(user_header, sizeof(user_header), "X-Inbe-User: %s", user_id);
}
sync_join_url(url, sizeof(url), base_url, INBE_LOGIN_PATH);
snprintf(user_header, sizeof(user_header), "X-Inbe-User: %s", account->public_id);
snprintf(signature_header, sizeof(signature_header), "X-Inbe-Signature: %s", signature_hex);
headers[0] = "Content-Type: application/json";
headers[1] = user_header;
headers[2] = signature_header;
ok = sync_http_request(method, url, body, headers, 3, &response, &status);
free(response.data);
if(!ok)
ok = sync_http_request("POST", url, body.data, headers, 3, &response, &status);
free(body.data);
if(!ok) {
sync_log_http_failure("login request", status, response.data);
return INBE_SYNC_CLIENT_REQUEST_FAILED;
if(status == 401)
}
if(status == 401) {
sync_log_http_failure("login auth", status, response.data);
free(response.data);
return INBE_SYNC_CLIENT_AUTH_FAILED;
return status >= 200 && status < 300 ? INBE_SYNC_CLIENT_OK : INBE_SYNC_CLIENT_REQUEST_FAILED;
}
if(status < 200 || status >= 300) {
sync_log_http_failure("login", status, response.data);
free(response.data);
return INBE_SYNC_CLIENT_REQUEST_FAILED;
}
expires_in = sync_find_json_int64(response.data, "expires_in_seconds", 3600);
if(!sync_find_json_string(response.data, "auth_token", token, sizeof(token))) {
sync_log_http_failure("login payload", status, response.data);
free(response.data);
return INBE_SYNC_CLIENT_PAYLOAD_FAILED;
}
expires_at = (long long)time(NULL) + expires_in - 30;
if(expires_at < (long long)time(NULL))
expires_at = (long long)time(NULL);
{
char text[32];
snprintf(text, sizeof(text), "%lld", expires_at);
inbe_storage_set_setting_text(INBE_SYNC_AUTH_TOKEN_KEY, token);
inbe_storage_set_setting_text(INBE_SYNC_AUTH_TOKEN_EXPIRES_KEY, text);
}
free(response.data);
return INBE_SYNC_CLIENT_OK;
}
static int
sync_load_valid_auth_token(char *out, size_t out_size)
{
const char *token;
const char *expires_text;
char token_copy[4096];
long long expires_at;
if(out == NULL || out_size == 0)
return 0;
out[0] = '\0';
token = inbe_storage_get_setting_text(INBE_SYNC_AUTH_TOKEN_KEY);
snprintf(token_copy, sizeof(token_copy), "%s", token != NULL ? token : "");
expires_text = inbe_storage_get_setting_text(INBE_SYNC_AUTH_TOKEN_EXPIRES_KEY);
expires_at = expires_text != NULL ? atoll(expires_text) : 0;
if(token_copy[0] == '\0' || expires_at <= (long long)time(NULL))
return 0;
snprintf(out, out_size, "%s", token_copy);
return out[0] != '\0';
}
void
inbe_sync_client_clear_auth_token(void)
{
inbe_storage_set_setting_text(INBE_SYNC_AUTH_TOKEN_KEY, "");
inbe_storage_set_setting_text(INBE_SYNC_AUTH_TOKEN_EXPIRES_KEY, "");
}
static InbeSyncClientResult
sync_send_bearer(const char *base_url, const char *user_id, const char *body, const char *token)
{
char url[768];
char user_header[96];
char auth_header[4200];
const char *headers[3];
SyncBuffer response = {0};
long status = 0;
int ok;
sync_join_url(url, sizeof(url), base_url, INBE_SYNC_PATH);
snprintf(user_header, sizeof(user_header), "X-Inbe-User: %s", user_id);
snprintf(auth_header, sizeof(auth_header), "Authorization: Bearer %s", token != NULL ? token : "");
headers[0] = "Content-Type: application/json";
headers[1] = user_header;
headers[2] = auth_header;
ok = sync_http_request("POST", url, body, headers, 3, &response, &status);
if(!ok) {
sync_log_http_failure("sync request", status, response.data);
return INBE_SYNC_CLIENT_REQUEST_FAILED;
}
if(status == 401) {
sync_log_http_failure("sync auth", status, response.data);
free(response.data);
return INBE_SYNC_CLIENT_AUTH_FAILED;
}
if(status < 200 || status >= 300) {
sync_log_http_failure("sync", status, response.data);
free(response.data);
return INBE_SYNC_CLIENT_REQUEST_FAILED;
}
if(!inbe_storage_apply_sync_response_json(response.data)) {
sync_log_http_failure("sync payload", status, response.data);
free(response.data);
return INBE_SYNC_CLIENT_PAYLOAD_FAILED;
}
free(response.data);
return INBE_SYNC_CLIENT_OK;
}
#endif
#if !defined(INBE_SYNC_CLIENT_HAS_HTTP)
void
inbe_sync_client_clear_auth_token(void)
{
inbe_storage_set_setting_text(INBE_SYNC_AUTH_TOKEN_KEY, "");
inbe_storage_set_setting_text(INBE_SYNC_AUTH_TOKEN_EXPIRES_KEY, "");
}
#endif
@@ -577,15 +778,31 @@ inbe_sync_client_sync(const char *base_url)
InbeSyncAccount account;
char *payload;
InbeSyncClientResult result;
char token[4096];
if(!inbe_sync_client_url_valid(base_url))
return INBE_SYNC_CLIENT_INVALID_URL;
if(!inbe_sync_account_load(&account))
return INBE_SYNC_CLIENT_NO_ACCOUNT;
payload = inbe_storage_build_sync_payload_json(account.public_id, account.public_key_hex);
if(!sync_load_valid_auth_token(token, sizeof(token))) {
result = sync_login(base_url, &account);
if(result != INBE_SYNC_CLIENT_OK)
return result;
if(!sync_load_valid_auth_token(token, sizeof(token)))
return INBE_SYNC_CLIENT_AUTH_FAILED;
}
payload = inbe_storage_build_sync_payload_json(account.public_id, NULL);
if(payload == NULL)
return INBE_SYNC_CLIENT_PAYLOAD_FAILED;
result = sync_send_signed(base_url, INBE_SYNC_PATH, "POST", account.public_id, payload);
result = sync_send_bearer(base_url, account.public_id, payload, token);
if(result == INBE_SYNC_CLIENT_AUTH_FAILED) {
inbe_sync_client_clear_auth_token();
result = sync_login(base_url, &account);
if(result == INBE_SYNC_CLIENT_OK && sync_load_valid_auth_token(token, sizeof(token)))
result = sync_send_bearer(base_url, account.public_id, payload, token);
else if(result == INBE_SYNC_CLIENT_OK)
result = INBE_SYNC_CLIENT_AUTH_FAILED;
}
inbe_storage_free_sync_payload_json(payload);
return result;
#else
+2
View File
@@ -19,5 +19,7 @@ int inbe_sync_client_url_valid(const char *url);
int inbe_sync_client_normalize_url(const char *input, char *out, size_t out_size);
InbeSyncClientResult inbe_sync_client_sync(const char *base_url);
InbeSyncClientResult inbe_sync_client_delete_account(const char *base_url);
const char *inbe_sync_client_result_name(InbeSyncClientResult result);
void inbe_sync_client_clear_auth_token(void);
#endif
+164
View File
@@ -186,6 +186,167 @@ insert_raw_habit_day(const char *root, const char *habit_id, int local_date, int
sqlite3_close(db);
}
static int
read_raw_habit_day_count(const char *root, const char *habit_id, int local_date)
{
char db_path[512];
sqlite3 *db = NULL;
sqlite3_stmt *stmt = NULL;
int count = -1;
make_path(db_path, sizeof(db_path), root, "inbe.db");
check_true("open raw count db", sqlite3_open(db_path, &db) == SQLITE_OK);
if(db == NULL)
return count;
if(sqlite3_prepare_v2(db,
"SELECT count FROM habit_days WHERE habit_id=?1 AND local_date=?2",
-1, &stmt, NULL) == SQLITE_OK) {
sqlite3_bind_text(stmt, 1, habit_id, -1, SQLITE_TRANSIENT);
sqlite3_bind_int(stmt, 2, local_date);
if(sqlite3_step(stmt) == SQLITE_ROW)
count = sqlite3_column_int(stmt, 0);
} else {
check_true("prepare raw count", 0);
}
sqlite3_finalize(stmt);
sqlite3_close(db);
return count;
}
static void
test_sync_apply_preserves_counter_counts(void)
{
char root[512];
const char *habit_id = "counter-habit";
const char *lower_count_response =
"{\"server_version\":1,\"changes\":{\"habits\":[],\"habit_days\":["
"{\"habit_id\":\"counter-habit\",\"local_date\":20260619,"
"\"completed\":true,\"count\":1,\"updated_at\":\"2026-06-19T21:00:00Z\"}"
"],\"sessions\":[]}}";
const char *higher_count_response =
"{\"server_version\":2,\"changes\":{\"habits\":[],\"habit_days\":["
"{\"habit_id\":\"counter-habit\",\"local_date\":20260619,"
"\"completed\":true,\"count\":5,\"updated_at\":\"2026-06-19T21:00:00Z\"}"
"],\"sessions\":[]}}";
make_clean_root(root, sizeof(root), "sync-counter");
check_true("init sync counter db", inbe_storage_init(root));
inbe_storage_close();
{
char db_path[512];
sqlite3 *db = NULL;
make_path(db_path, sizeof(db_path), root, "inbe.db");
check_true("open sync counter raw db", sqlite3_open(db_path, &db) == SQLITE_OK);
if(db != NULL) {
check_true("insert sync counter habit",
sqlite3_exec(db,
"INSERT INTO habits(id,user_id,name,color_r,color_g,color_b,sync_mode,sync_activity,counter_enabled,sort_order,deleted_at,updated_at) "
"VALUES('counter-habit','default','Counter',255,255,255,0,0,1,0,0,1781902800);"
"INSERT INTO habit_days(habit_id,local_date,completed,count,updated_at) "
"VALUES('counter-habit',20260619,1,4,1781902800);",
NULL, NULL, NULL) == SQLITE_OK);
sqlite3_close(db);
}
}
check_true("reopen sync counter db", inbe_storage_init(root));
check_true("apply lower equal counter", inbe_storage_apply_sync_response_json(lower_count_response));
inbe_storage_close();
check_int("lower equal sync does not reset counter",
read_raw_habit_day_count(root, habit_id, 20260619), 4);
check_true("reopen sync counter db for repair", inbe_storage_init(root));
check_true("apply higher equal counter", inbe_storage_apply_sync_response_json(higher_count_response));
inbe_storage_close();
check_int("higher equal sync repairs counter",
read_raw_habit_day_count(root, habit_id, 20260619), 5);
remove_tree(root);
}
static void
test_session_linked_counts_materialize_for_sync(void)
{
char root[512];
char first_id[INBE_STORAGE_ID_SIZE + 4];
char second_id[INBE_STORAGE_ID_SIZE + 4];
int first_rounds[] = {30};
int second_rounds[] = {45};
int today = inbe_habits_today_index();
InbeHabits habits;
char *payload;
make_clean_root(root, sizeof(root), "session-linked-count");
check_true("init linked counter db", inbe_storage_init(root));
memset(&habits, 0, sizeof(habits));
inbe_habits_add_default_set(&habits);
check_true("save linked session one",
inbe_storage_save_session_for_activity(first_rounds, 1, 0, 1,
first_id, sizeof(first_id)));
check_true("save linked session two",
inbe_storage_save_session_for_activity(second_rounds, 1, 0, 1,
second_id, sizeof(second_id)));
memset(&habits, 0, sizeof(habits));
check_true("load linked counter habits", inbe_storage_habits_load(&habits));
check_int("linked sessions materialize count",
inbe_habit_day_count(&habits.items[0], today), 2);
payload = inbe_storage_build_sync_payload_json("test-hash", "test-public-key");
check_true("linked session count is in sync payload",
payload != NULL && strstr(payload, "\"count\":2") != NULL);
inbe_storage_free_sync_payload_json(payload);
check_true("delete linked session one", inbe_storage_delete_session(first_id));
memset(&habits, 0, sizeof(habits));
check_true("reload linked counter after delete", inbe_storage_habits_load(&habits));
check_int("linked session delete lowers derived count",
inbe_habit_day_count(&habits.items[0], today), 1);
inbe_habit_set_day_count(&habits, 0, today, 4);
inbe_habits_save(&habits);
check_true("delete linked session two", inbe_storage_delete_session(second_id));
memset(&habits, 0, sizeof(habits));
check_true("reload linked counter after manual override", inbe_storage_habits_load(&habits));
check_int("linked session delete preserves manual count",
inbe_habit_day_count(&habits.items[0], today), 4);
inbe_storage_close();
remove_tree(root);
}
static void
test_existing_sessions_materialize_after_habit_save(void)
{
char root[512];
int rounds[] = {30};
int today = inbe_habits_today_index();
InbeHabits habits;
char *payload;
make_clean_root(root, sizeof(root), "existing-session-linked-count");
check_true("init existing linked counter db", inbe_storage_init(root));
check_true("save existing linked session",
inbe_storage_save_session_for_activity(rounds, 1, 0, 1, NULL, 0));
memset(&habits, 0, sizeof(habits));
inbe_habits_add_default_set(&habits);
memset(&habits, 0, sizeof(habits));
check_true("load existing linked counter habits", inbe_storage_habits_load(&habits));
check_int("existing linked session materializes after habit save",
inbe_habit_day_count(&habits.items[0], today), 1);
payload = inbe_storage_build_sync_payload_json("test-hash", "test-public-key");
check_true("existing linked session count is in sync payload",
payload != NULL && strstr(payload, "\"count\":1") != NULL);
inbe_storage_free_sync_payload_json(payload);
inbe_storage_close();
remove_tree(root);
}
static void
metadata_history_callback(const char *id, int year, int month, int day,
int hour, int minute, int second,
@@ -824,6 +985,9 @@ main(void)
test_tickmate_db_import();
test_tickmate_reimport_recovers_counter_data();
test_external_tickmate_db_import();
test_sync_apply_preserves_counter_counts();
test_session_linked_counts_materialize_for_sync();
test_existing_sessions_materialize_after_habit_save();
test_session_metadata();
if(g_failures != 0) {
+28
View File
@@ -31,6 +31,11 @@ TraceLog(int log_level, const char *text, ...)
(void)text;
}
void
inbe_sync_client_clear_auth_token(void)
{
}
char *
LoadFileText(const char *file_name)
{
@@ -209,6 +214,7 @@ test_import_export_clear(void)
char private_key[5121];
InbeSyncAccount account;
char *exported;
FILE *file;
make_clean_root(root, sizeof(root), "roundtrip");
snprintf(key_path, sizeof(key_path), "%s/inbe-sync.key", root);
@@ -236,6 +242,28 @@ test_import_export_clear(void)
check_true("import exported key", inbe_sync_account_import_private_key(&account, export_path));
check_str("reimport public id", account.public_id, public_id);
file = fopen(key_path, "wb");
check_true("open secret key alias file", file != NULL);
if(file != NULL) {
fprintf(file,
"inbe-sync-key-v1\nalgorithm=ML-DSA-44\npublic_key=%s\nsecret_key=%s\n",
public_key, private_key);
fclose(file);
}
check_true("import secret key alias", inbe_sync_account_import_private_key(&account, key_path));
check_str("derive public id", account.public_id, public_id);
file = fopen(key_path, "wb");
check_true("open exported key json file", file != NULL);
if(file != NULL) {
fprintf(file,
"{\"exported_key\":\"inbe-sync-key-v1\\nalgorithm=ML-DSA-44\\npublic_id=%s\\npublic_key=%s\\nprivate_key=%s\\n\"}\n",
public_id, public_key, private_key);
fclose(file);
}
check_true("import exported key json", inbe_sync_account_import_private_key(&account, key_path));
check_str("json public key", account.public_key_hex, public_key);
inbe_storage_close();
remove_tree(root);
}