powersync prototype (WIP)

Gemfile.lock

@@ -5,25 +5,25 @@ GEM
       base64
       nkf
       rexml
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.944.0)
-    aws-sdk-core (3.197.0)
+    aws-partitions (1.960.0)
+    aws-sdk-core (3.201.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.84.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.3)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.9.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -38,7 +38,7 @@ GEM
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.110.0)
+    excon (0.111.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -60,15 +60,15 @@ GEM
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.220.0)
+    fastlane (2.222.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -153,9 +153,9 @@ GEM
     httpclient (2.8.3)
     jmespath (1.6.2)
     json (2.7.2)
-    jwt (2.8.1)
+    jwt (2.8.2)
       base64
-    mini_magick (4.13.1)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -165,7 +165,7 @@ GEM
     optparse (0.5.0)
     os (1.1.4)
     plist (3.7.1)
-    public_suffix (5.1.0)
+    public_suffix (6.0.1)
     rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)

android/settings.gradle

@@ -19,7 +19,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "7.3.1" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.21" apply false
 }
 
 include ":app"

fastlane/report.xml

@@ -5,12 +5,12 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000214">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000258">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="1: upload_to_play_store" time="167.371876">
+      <testcase classname="fastlane.lanes" name="1: upload_to_play_store" time="178.169255">
 
       </testcase>
 

lib/api_client.dart

@@ -0,0 +1,64 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:http/http.dart' as http;
+import 'package:logging/logging.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'helpers/consts.dart';
+
+final log = Logger('powersync-test');
+
+class ApiClient {
+  final String baseUrl;
+
+  const ApiClient(this.baseUrl);
+
+  /// Returns a powersync JWT token token
+  ///
+  /// Note that at the moment we use the permanent API token for authentication
+  /// but this should be probably changed to the wger API JWT tokens in the
+  /// future since they are not permanent and could be easily revoked.
+  Future<Map<String, dynamic>> getPowersyncToken() async {
+    final prefs = await SharedPreferences.getInstance();
+    final apiData = json.decode(prefs.getString(PREFS_USER)!);
+    print('posting our token "${apiData["token"]}" to $baseUrl/api/v2/powersync-token');
+    final response = await http.get(
+      Uri.parse('$baseUrl/api/v2/powersync-token'),
+      headers: {
+        HttpHeaders.contentTypeHeader: 'application/json',
+        HttpHeaders.authorizationHeader: 'Token ${apiData["token"]}',
+      },
+    );
+    print('response: status ${response.statusCode}, body ${response.body}');
+    if (response.statusCode == 200) {
+      log.log(Level.ALL, response.body);
+      return json.decode(response.body);
+    }
+    throw Exception('Failed to fetch token');
+  }
+
+  Future<void> upsert(Map<String, dynamic> record) async {
+    await http.put(
+      Uri.parse('$baseUrl/api/upload-powersync-data'),
+      headers: {'Content-Type': 'application/json'},
+      body: json.encode(record),
+    );
+  }
+
+  Future<void> update(Map<String, dynamic> record) async {
+    await http.patch(
+      Uri.parse('$baseUrl/api/upload-powersync-data'),
+      headers: {'Content-Type': 'application/json'},
+      body: json.encode(record),
+    );
+  }
+
+  Future<void> delete(Map<String, dynamic> record) async {
+    await http.delete(
+      Uri.parse('$baseUrl/api/v2/upload-powersync-data'),
+      headers: {'Content-Type': 'application/json'},
+      body: json.encode(record),
+    );
+  }
+}

lib/helpers/consts.dart

@@ -109,7 +109,7 @@ enum EXERCISE_IMAGE_ART_STYLE {
 }
 
 /// Dummy ID for pseudo meals
-const PSEUDO_MEAL_ID = -1;
+const PSEUDO_MEAL_ID = 'deadbeef';
 
 /// Colors used for muscles
 const COLOR_MAIN_MUSCLES = Colors.red;

lib/main.dart

@@ -16,10 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/core/locator.dart';
+import 'package:wger/powersync.dart';
 import 'package:wger/providers/add_exercise.dart';
 import 'package:wger/providers/base_provider.dart';
 import 'package:wger/providers/body_weight.dart';
@@ -52,17 +54,32 @@ import 'package:wger/screens/workout_plans_screen.dart';
 import 'package:wger/theme/theme.dart';
 import 'package:wger/widgets/core/about.dart';
 import 'package:wger/widgets/core/settings.dart';
+import 'package:logging/logging.dart';
 
 import 'providers/auth.dart';
 
 void main() async {
   //zx.setLogEnabled(kDebugMode);
+  Logger.root.level = Level.INFO;
+  Logger.root.onRecord.listen((record) {
+    if (kDebugMode) {
+      print('[${record.loggerName}] ${record.level.name}: ${record.time}: ${record.message}');
+
+      if (record.error != null) {
+        print(record.error);
+      }
+      if (record.stackTrace != null) {
+        print(record.stackTrace);
+      }
+    }
+  });
 
   // Needs to be called before runApp
   WidgetsFlutterBinding.ensureInitialized();
 
   // Locator to initialize exerciseDB
   await ServiceLocator().configure();
+  print('running myapp');
   // Application
   runApp(const MyApp());
 }

lib/models/muscle.dart

@@ -0,0 +1,37 @@
+import 'package:powersync/sqlite3.dart' as sqlite;
+import 'package:wger/models/schema.dart';
+import 'package:wger/powersync.dart';
+
+class Muscle {
+  final String id;
+  final String name;
+  final String nameEn;
+  final bool isFront;
+
+  const Muscle({
+    required this.id,
+    required this.name,
+    required this.nameEn,
+    required this.isFront,
+  });
+
+  factory Muscle.fromRow(sqlite.Row row) {
+    return Muscle(
+      id: row['id'],
+      name: row['name'],
+      nameEn: row['name_en'],
+      isFront: row['is_front'] == 1,
+    );
+  }
+
+  Future<void> delete() async {
+    await db.execute('DELETE FROM $tableMuscles WHERE id = ?', [id]);
+  }
+
+  /// Watch all lists.
+  static Stream<List<Muscle>> watchMuscles() {
+    return db.watch('SELECT * FROM $tableMuscles ORDER BY id').map((results) {
+      return results.map(Muscle.fromRow).toList(growable: false);
+    });
+  }
+}

lib/models/nutrition/log.dart

@@ -17,24 +17,28 @@
  */
 
 import 'package:json_annotation/json_annotation.dart';
+import 'package:powersync/powersync.dart';
+import 'package:powersync/sqlite3.dart' as sqlite;
 import 'package:wger/helpers/json.dart';
 import 'package:wger/models/nutrition/ingredient.dart';
 import 'package:wger/models/nutrition/ingredient_weight_unit.dart';
 import 'package:wger/models/nutrition/meal_item.dart';
 import 'package:wger/models/nutrition/nutritional_values.dart';
+import 'package:wger/models/schema.dart';
+import 'package:wger/powersync.dart';
 
 part 'log.g.dart';
 
 @JsonSerializable()
 class Log {
   @JsonKey(required: true)
-  int? id;
+  String? id;
 
   @JsonKey(required: false, name: 'meal')
-  int? mealId;
+  String? mealId;
 
   @JsonKey(required: true, name: 'plan')
-  int planId;
+  String planId;
 
   @JsonKey(required: true)
   late DateTime datetime;
@@ -75,6 +79,19 @@ class Log {
     amount = mealItem.amount;
   }
 
+  factory Log.fromRow(sqlite.Row row) {
+    return Log(
+      id: row['id'],
+      mealId: row['meal_id'],
+      ingredientId: row['ingredient_id'],
+      weightUnitId: row['weight_unit_id'],
+      amount: row['amount'],
+      planId: row['plan_id'],
+      datetime: DateTime.parse(row['datetime']),
+      comment: row['comment'],
+    );
+  }
+
   // Boilerplate
   factory Log.fromJson(Map<String, dynamic> json) => _$LogFromJson(json);
 
@@ -89,4 +106,38 @@ class Log {
 
     return ingredient.nutritionalValues / (100 / weight);
   }
+
+  static Future<List<Log>> readByMealId(String mealId) async {
+    final results = await db.getAll('SELECT * FROM $tableLogItems WHERE meal_id = ?', [mealId]);
+    return results.map((r) => Log.fromRow(r)).toList();
+  }
+
+  static Future<List<Log>> readByPlanId(String planId) async {
+    final results = await db.getAll('SELECT * FROM $tableLogItems WHERE plan_id = ?', [planId]);
+    return results.map((r) => Log.fromRow(r)).toList();
+  }
+
+/*
+  Future<void> delete() async {
+    await db.execute('DELETE FROM $logItemsTable WHERE id = ?', [id]);
+  }
+  */
+
+  Future<void> log() async {
+    print('DIETER Log.log called id=$id, planId=$planId');
+    await db.execute(
+      'INSERT INTO $tableLogItems (id, meal_id, ingredient_id, weight_unit_id, amount, plan_id, datetime, comment) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
+      [
+        // generate an id using uuid
+        uuid.v4(),
+        mealId,
+        ingredientId,
+        weightUnitId,
+        amount,
+        planId,
+        datetime.toIso8601String(),
+        comment,
+      ],
+    );
+  }
 }