Merge pull request #196 from appwrite/dev

Fix for realtime subscriptions

Author: lohanidamodar

README.md

@@ -6,6 +6,7 @@
 library appwrite;
 
 import 'dart:async';
+import 'dart:math';
 import 'dart:typed_data';
 import 'dart:convert';
 

lib/appwrite.dart

@@ -1,16 +1,37 @@
-part of appwrite;
+part of 'appwrite.dart';
 
 /// Helper class to generate ID strings for resources.
 class ID {
   ID._();
 
-  /// Have Appwrite generate a unique ID for you.
-  static String unique() {
-    return 'unique()';
+  // Generate an hex ID based on timestamp
+  // Recreated from https://www.php.net/manual/en/function.uniqid.php
+  static String _hexTimestamp() {
+    final now = DateTime.now();
+    final sec = (now.millisecondsSinceEpoch / 1000).floor();
+    final usec = now.microsecondsSinceEpoch - (sec * 1000000);
+    return sec.toRadixString(16) +
+        usec.toRadixString(16).padLeft(5, '0');
+  }
+
+  // Generate a unique ID with padding to have a longer ID
+  static String unique({int padding = 7}) {
+    String id = _hexTimestamp();
+
+    if (padding > 0) {
+      StringBuffer sb = StringBuffer();
+      for (var i = 0; i < padding; i++) {
+        sb.write(Random().nextInt(16).toRadixString(16));
+      }
+
+      id += sb.toString();
+    }
+
+    return id;
   }
 
   /// Uses [id] as the ID for the resource.
   static String custom(String id) {
     return id;
   }
-}
+}

lib/id.dart

@@ -1,4 +1,4 @@
-part of appwrite;
+part of 'appwrite.dart';
 
 /// Helper class to generate permission strings for resources.
 class Permission {

lib/permission.dart

@@ -1,4 +1,4 @@
-part of appwrite;
+part of 'appwrite.dart';
 
 
 /// Helper class to generate query strings.

lib/query.dart

@@ -1,4 +1,4 @@
-part of appwrite;
+part of 'appwrite.dart';
 
 /// Helper class to generate role strings for [Permission].
 class Role {

lib/role.dart

@@ -1,4 +1,4 @@
-part of appwrite;
+part of '../appwrite.dart';
 
 /// The Account service allows you to authenticate and manage a user account.
 class Account extends Service {
@@ -231,7 +231,7 @@ class Account extends Service {
     /// Delete Authenticator
     ///
     /// Delete an authenticator for a user by ID.
-    Future<models.User> deleteMfaAuthenticator({required enums.AuthenticatorType type, required String otp}) async {
+    Future deleteMfaAuthenticator({required enums.AuthenticatorType type, required String otp}) async {
         final String apiPath = '/account/mfa/authenticators/{type}'.replaceAll('{type}', type.value);
 
         final Map<String, dynamic> apiParams = {
@@ -244,7 +244,7 @@ class Account extends Service {
 
         final res = await client.call(HttpMethod.delete, path: apiPath, params: apiParams, headers: apiHeaders);
 
-        return models.User.fromMap(res.data);
+        return  res.data;
 
     }
 

lib/services/account.dart

@@ -1,4 +1,4 @@
-part of appwrite;
+part of '../appwrite.dart';
 
 /// The Avatars service aims to help you complete everyday tasks related to
 /// your app image, icons, and avatars.

lib/services/avatars.dart

@@ -1,4 +1,4 @@
-part of appwrite;
+part of '../appwrite.dart';
 
 /// The Databases service allows you to create structured collections of
 /// documents, query and filter lists of documents

lib/services/databases.dart

@@ -1,4 +1,4 @@
-part of appwrite;
+part of '../appwrite.dart';
 
 /// The Functions Service allows you view, create and manage your Cloud
 /// Functions.