Merge remote-tracking branch 'origin/main' into integration/v2

README.md

@@ -290,7 +290,7 @@ When a 128 bit or 256 bit key is provided to the library, the `data` attributes
 ```javascript
 // Generate a random 256-bit key for demonstration purposes (in
 // practice you need to create one and distribute it to clients yourselves)
-Ably.Realtime.Platform.Crypto.generateRandomKey(function (err, key) {
+Ably.Realtime.Crypto.generateRandomKey(function (err, key) {
   var channel = client.channels.get('channelName', { cipher: { key: key } });
 
   channel.subscribe(function (message) {

src/common/lib/client/rest.ts

@@ -240,8 +240,8 @@ class Rest {
   static Callbacks = Rest;
   static Platform = Platform;
   static Crypto?: typeof Platform.Crypto;
-  static Message?: typeof Message;
-  static PresenceMessage?: typeof PresenceMessage;
+  static Message = Message;
+  static PresenceMessage = PresenceMessage;
 }
 
 class Channels {

src/platform/nativescript/index.ts

@@ -14,13 +14,10 @@ import Config from './config';
 import Transports from '../web/lib/transport';
 import Logger from '../../common/lib/util/logger';
 import { getDefaults } from '../../common/lib/util/defaults';
-import ConnectionManager from '../../common/lib/transport/connectionmanager';
 // @ts-ignore
 import WebStorage from './lib/util/webstorage';
 import PlatformDefaults from '../web/lib/util/defaults';
 import msgpack from '../web/lib/util/msgpack';
-import Message from 'common/lib/types/message';
-import PresenceMessage from 'common/lib/types/presencemessage';
 
 Platform.Crypto = Crypto;
 Platform.BufferUtils = BufferUtils;
@@ -32,14 +29,6 @@ Platform.WebStorage = WebStorage;
 Rest.Crypto = Crypto;
 Realtime.Crypto = Crypto;
 
-Rest.Message = Message;
-Realtime.Message = Message;
-
-Rest.PresenceMessage = PresenceMessage;
-Realtime.PresenceMessage = PresenceMessage;
-
-Realtime.ConnectionManager = ConnectionManager;
-
 Logger.initLogHandlers();
 
 Platform.Defaults = getDefaults(PlatformDefaults);

src/platform/nodejs/index.ts

@@ -13,10 +13,7 @@ import Config from './config';
 import Transports from './lib/transport';
 import Logger from '../../common/lib/util/logger';
 import { getDefaults } from '../../common/lib/util/defaults';
-import ConnectionManager from '../../common/lib/transport/connectionmanager';
 import PlatformDefaults from './lib/util/defaults';
-import Message from 'common/lib/types/message';
-import PresenceMessage from 'common/lib/types/presencemessage';
 
 Platform.Crypto = Crypto;
 Platform.BufferUtils = BufferUtils;
@@ -28,14 +25,6 @@ Platform.WebStorage = null;
 Rest.Crypto = Crypto;
 Realtime.Crypto = Crypto;
 
-Rest.Message = Message;
-Realtime.Message = Message;
-
-Rest.PresenceMessage = PresenceMessage;
-Realtime.PresenceMessage = PresenceMessage;
-
-Realtime.ConnectionManager = ConnectionManager;
-
 Logger.initLogHandlers();
 
 Platform.Defaults = getDefaults(PlatformDefaults);

src/platform/react-native/index.ts

@@ -13,12 +13,9 @@ import Config from './config';
 import Transports from '../web/lib/transport';
 import Logger from '../../common/lib/util/logger';
 import { getDefaults } from '../../common/lib/util/defaults';
-import ConnectionManager from '../../common/lib/transport/connectionmanager';
 import WebStorage from '../web/lib/util/webstorage';
 import PlatformDefaults from '../web/lib/util/defaults';
 import msgpack from '../web/lib/util/msgpack';
-import Message from 'common/lib/types/message';
-import PresenceMessage from 'common/lib/types/presencemessage';
 
 Platform.Crypto = Crypto;
 Platform.BufferUtils = BufferUtils;
@@ -30,14 +27,6 @@ Platform.WebStorage = WebStorage;
 Rest.Crypto = Crypto;
 Realtime.Crypto = Crypto;
 
-Rest.Message = Message;
-Realtime.Message = Message;
-
-Rest.PresenceMessage = PresenceMessage;
-Realtime.PresenceMessage = PresenceMessage;
-
-Realtime.ConnectionManager = ConnectionManager;
-
 Logger.initLogHandlers();
 
 Platform.Defaults = getDefaults(PlatformDefaults);

src/platform/web-noencryption/index.ts

@@ -12,12 +12,9 @@ import Config from '../web/config';
 import Transports from '../web/lib/transport';
 import Logger from '../../common/lib/util/logger';
 import { getDefaults } from '../../common/lib/util/defaults';
-import ConnectionManager from '../../common/lib/transport/connectionmanager';
 import WebStorage from '../web/lib/util/webstorage';
 import PlatformDefaults from '../web/lib/util/defaults';
 import msgpack from '../web/lib/util/msgpack';
-import Message from 'common/lib/types/message';
-import PresenceMessage from 'common/lib/types/presencemessage';
 
 Platform.Crypto = null;
 Platform.BufferUtils = BufferUtils;
@@ -26,16 +23,8 @@ Platform.Config = Config;
 Platform.Transports = Transports;
 Platform.WebStorage = WebStorage;
 
-Rest.Crypto = Crypto;
-Realtime.Crypto = Crypto;
-
-Rest.Message = Message;
-Realtime.Message = Message;
-
-Rest.PresenceMessage = PresenceMessage;
-Realtime.PresenceMessage = PresenceMessage;
-
-Realtime.ConnectionManager = ConnectionManager;
+Rest.Crypto = null;
+Realtime.Crypto = null;
 
 Logger.initLogHandlers();
 

src/platform/web/index.ts

@@ -13,12 +13,9 @@ import Config from './config';
 import Transports from './lib/transport';
 import Logger from '../../common/lib/util/logger';
 import { getDefaults } from '../../common/lib/util/defaults';
-import ConnectionManager from '../../common/lib/transport/connectionmanager';
 import WebStorage from './lib/util/webstorage';
 import PlatformDefaults from './lib/util/defaults';
 import msgpack from './lib/util/msgpack';
-import Message from 'common/lib/types/message';
-import PresenceMessage from 'common/lib/types/presencemessage';
 
 Platform.Crypto = Crypto;
 Platform.BufferUtils = BufferUtils;
@@ -30,14 +27,6 @@ Platform.WebStorage = WebStorage;
 Rest.Crypto = Crypto;
 Realtime.Crypto = Crypto;
 
-Rest.Message = Message;
-Realtime.Message = Message;
-
-Rest.PresenceMessage = PresenceMessage;
-Realtime.PresenceMessage = PresenceMessage;
-
-Realtime.ConnectionManager = ConnectionManager;
-
 Logger.initLogHandlers();
 
 Platform.Defaults = getDefaults(PlatformDefaults);