Merge pull request #196 from appwrite/dev

Fix for realtime subscriptions
appwrite · Apr 25, 2024 · 7186e87 · 7186e87
2 parents 9dd03c8 + 17630f8
commit 7186e87
Show file tree

Hide file tree

Showing 82 changed files with 205 additions and 155 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Add this to your package's `pubspec.yaml` file:
 
 ```yml
 dependencies:
-  appwrite: ^12.0.1
+  appwrite: ^12.0.2
 ```
 
 You can install packages from the command line:

diff --git a/lib/appwrite.dart b/lib/appwrite.dart
@@ -6,6 +6,7 @@
 library appwrite;
 
 import 'dart:async';
+import 'dart:math';
 import 'dart:typed_data';
 import 'dart:convert';
 

diff --git a/lib/id.dart b/lib/id.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;
   }
-}
+}
diff --git a/lib/permission.dart b/lib/permission.dart
@@ -1,4 +1,4 @@
-part of appwrite;
+part of 'appwrite.dart';
 
 /// Helper class to generate permission strings for resources.
 class Permission {

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

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

diff --git a/lib/services/account.dart b/lib/services/account.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;
 
     }
 

diff --git a/lib/services/avatars.dart b/lib/services/avatars.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.

diff --git a/lib/services/databases.dart b/lib/services/databases.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

diff --git a/lib/services/functions.dart b/lib/services/functions.dart
@@ -1,4 +1,4 @@
-part of appwrite;
+part of '../appwrite.dart';
 
 /// The Functions Service allows you view, create and manage your Cloud
 /// Functions.

diff --git a/lib/services/graphql.dart b/lib/services/graphql.dart
@@ -1,4 +1,4 @@
-part of appwrite;
+part of '../appwrite.dart';
 
 /// The GraphQL API allows you to query and mutate your Appwrite server using
 /// GraphQL.

diff --git a/lib/services/locale.dart b/lib/services/locale.dart
@@ -1,4 +1,4 @@
-part of appwrite;
+part of '../appwrite.dart';
 
 /// The Locale service allows you to customize your app based on your users&#039;
 /// location.

diff --git a/lib/services/messaging.dart b/lib/services/messaging.dart
@@ -1,4 +1,4 @@
-part of appwrite;
+part of '../appwrite.dart';
 
 /// The Messaging service allows you to send messages to any provider type
 /// (SMTP, push notification, SMS, etc.).

diff --git a/lib/services/storage.dart b/lib/services/storage.dart
@@ -1,4 +1,4 @@
-part of appwrite;
+part of '../appwrite.dart';
 
 /// The Storage service allows you to manage your project files.
 class Storage extends Service {

diff --git a/lib/services/teams.dart b/lib/services/teams.dart
@@ -1,4 +1,4 @@
-part of appwrite;
+part of '../appwrite.dart';
 
 /// The Teams service allows you to group users of your project and to enable
 /// them to share read and write access to your project resources

diff --git a/lib/src/client_browser.dart b/lib/src/client_browser.dart
@@ -43,7 +43,7 @@ class ClientBrowser extends ClientBase with ClientMixin {
       'x-sdk-name': 'Flutter',
       'x-sdk-platform': 'client',
       'x-sdk-language': 'flutter',
-      'x-sdk-version': '12.0.1',
+      'x-sdk-version': '12.0.2',
       'X-Appwrite-Response-Format': '1.5.0',
     };
 

diff --git a/lib/src/client_io.dart b/lib/src/client_io.dart
@@ -64,7 +64,7 @@ class ClientIO extends ClientBase with ClientMixin {
       'x-sdk-name': 'Flutter',
       'x-sdk-platform': 'client',
       'x-sdk-language': 'flutter',
-      'x-sdk-version': '12.0.1',
+      'x-sdk-version': '12.0.2',
       'X-Appwrite-Response-Format' : '1.5.0',
     };
 

diff --git a/lib/src/enums/authentication_factor.dart b/lib/src/enums/authentication_factor.dart
@@ -1,4 +1,4 @@
-part of appwrite.enums;
+part of '../../enums.dart';
 
 enum AuthenticationFactor {
     email(value: 'email'),

diff --git a/lib/src/enums/authenticator_type.dart b/lib/src/enums/authenticator_type.dart
@@ -1,4 +1,4 @@
-part of appwrite.enums;
+part of '../../enums.dart';
 
 enum AuthenticatorType {
     totp(value: 'totp');

diff --git a/lib/src/enums/browser.dart b/lib/src/enums/browser.dart
@@ -1,4 +1,4 @@
-part of appwrite.enums;
+part of '../../enums.dart';
 
 enum Browser {
     avantBrowser(value: 'aa'),

diff --git a/lib/src/enums/credit_card.dart b/lib/src/enums/credit_card.dart
@@ -1,4 +1,4 @@
-part of appwrite.enums;
+part of '../../enums.dart';
 
 enum CreditCard {
     americanExpress(value: 'amex'),

diff --git a/lib/src/enums/execution_method.dart b/lib/src/enums/execution_method.dart
@@ -1,4 +1,4 @@
-part of appwrite.enums;
+part of '../../enums.dart';
 
 enum ExecutionMethod {
     gET(value: 'GET'),

diff --git a/lib/src/enums/flag.dart b/lib/src/enums/flag.dart
@@ -1,4 +1,4 @@
-part of appwrite.enums;
+part of '../../enums.dart';
 
 enum Flag {
     afghanistan(value: 'af'),

diff --git a/lib/src/enums/image_format.dart b/lib/src/enums/image_format.dart
@@ -1,4 +1,4 @@
-part of appwrite.enums;
+part of '../../enums.dart';
 
 enum ImageFormat {
     jpg(value: 'jpg'),

diff --git a/lib/src/enums/image_gravity.dart b/lib/src/enums/image_gravity.dart
@@ -1,4 +1,4 @@
-part of appwrite.enums;
+part of '../../enums.dart';
 
 enum ImageGravity {
     center(value: 'center'),

diff --git a/lib/src/enums/o_auth_provider.dart b/lib/src/enums/o_auth_provider.dart
@@ -1,4 +1,4 @@
-part of appwrite.enums;
+part of '../../enums.dart';
 
 enum OAuthProvider {
     amazon(value: 'amazon'),

diff --git a/lib/src/models/algo_argon2.dart b/lib/src/models/algo_argon2.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// AlgoArgon2
 class AlgoArgon2 implements Model {

diff --git a/lib/src/models/algo_bcrypt.dart b/lib/src/models/algo_bcrypt.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// AlgoBcrypt
 class AlgoBcrypt implements Model {

diff --git a/lib/src/models/algo_md5.dart b/lib/src/models/algo_md5.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// AlgoMD5
 class AlgoMd5 implements Model {

diff --git a/lib/src/models/algo_phpass.dart b/lib/src/models/algo_phpass.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// AlgoPHPass
 class AlgoPhpass implements Model {

diff --git a/lib/src/models/algo_scrypt.dart b/lib/src/models/algo_scrypt.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// AlgoScrypt
 class AlgoScrypt implements Model {

diff --git a/lib/src/models/algo_scrypt_modified.dart b/lib/src/models/algo_scrypt_modified.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// AlgoScryptModified
 class AlgoScryptModified implements Model {

diff --git a/lib/src/models/algo_sha.dart b/lib/src/models/algo_sha.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// AlgoSHA
 class AlgoSha implements Model {

diff --git a/lib/src/models/continent.dart b/lib/src/models/continent.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Continent
 class Continent implements Model {

diff --git a/lib/src/models/continent_list.dart b/lib/src/models/continent_list.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Continents List
 class ContinentList implements Model {

diff --git a/lib/src/models/country.dart b/lib/src/models/country.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Country
 class Country implements Model {

diff --git a/lib/src/models/country_list.dart b/lib/src/models/country_list.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Countries List
 class CountryList implements Model {

diff --git a/lib/src/models/currency.dart b/lib/src/models/currency.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Currency
 class Currency implements Model {

diff --git a/lib/src/models/currency_list.dart b/lib/src/models/currency_list.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Currencies List
 class CurrencyList implements Model {

diff --git a/lib/src/models/document.dart b/lib/src/models/document.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Document
 class Document implements Model {

diff --git a/lib/src/models/document_list.dart b/lib/src/models/document_list.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Documents List
 class DocumentList implements Model {

diff --git a/lib/src/models/execution.dart b/lib/src/models/execution.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Execution
 class Execution implements Model {

diff --git a/lib/src/models/execution_list.dart b/lib/src/models/execution_list.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Executions List
 class ExecutionList implements Model {

diff --git a/lib/src/models/file.dart b/lib/src/models/file.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// File
 class File implements Model {

diff --git a/lib/src/models/file_list.dart b/lib/src/models/file_list.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Files List
 class FileList implements Model {

diff --git a/lib/src/models/headers.dart b/lib/src/models/headers.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Headers
 class Headers implements Model {

diff --git a/lib/src/models/identity.dart b/lib/src/models/identity.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Identity
 class Identity implements Model {

diff --git a/lib/src/models/identity_list.dart b/lib/src/models/identity_list.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Identities List
 class IdentityList implements Model {

diff --git a/lib/src/models/jwt.dart b/lib/src/models/jwt.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// JWT
 class Jwt implements Model {

diff --git a/lib/src/models/language.dart b/lib/src/models/language.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Language
 class Language implements Model {

diff --git a/lib/src/models/language_list.dart b/lib/src/models/language_list.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Languages List
 class LanguageList implements Model {

diff --git a/lib/src/models/locale.dart b/lib/src/models/locale.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Locale
 class Locale implements Model {

diff --git a/lib/src/models/locale_code.dart b/lib/src/models/locale_code.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// LocaleCode
 class LocaleCode implements Model {

diff --git a/lib/src/models/locale_code_list.dart b/lib/src/models/locale_code_list.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Locale codes list
 class LocaleCodeList implements Model {

diff --git a/lib/src/models/log.dart b/lib/src/models/log.dart
@@ -1,4 +1,4 @@
-part of appwrite.models;
+part of '../../models.dart';
 
 /// Log
 class Log implements Model {