[ECO-4204] Remove code that's supporting older platforms (in v2)

.eslintrc.js

@@ -19,8 +19,6 @@ module.exports = {
     "plugin:security/recommended",
   ],
   rules: {
-    // comma-dangle used for browser compatibility for browsers that don't support trailing commas
-    "comma-dangle": ["error", "always-multiline"],
     "eol-last": "error",
     // security/detect-object-injection just gives a lot of false positives
     // see https://github.com/nodesecurity/eslint-plugin-security/issues/21
@@ -35,7 +33,6 @@ module.exports = {
     {
       files: ["**/*.{ts,tsx}"],
       rules: {
-        "comma-dangle": ["error", "only-multiline"],
         "@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_" }],
         // TypeScript already enforces these rules better than any eslint setup can
         "no-undef": "off",

scripts/moduleReport.ts

@@ -6,7 +6,7 @@ import { gzip } from 'zlib';
 import Table from 'cli-table';
 
 // The maximum size we allow for a minimal useful Realtime bundle (i.e. one that can subscribe to a channel)
-const minimalUsefulRealtimeBundleSizeThresholdsKiB = { raw: 96, gzip: 29 };
+const minimalUsefulRealtimeBundleSizeThresholdsKiB = { raw: 95, gzip: 29 };
 
 const baseClientNames = ['BaseRest', 'BaseRealtime'];
 

src/common/lib/client/auth.ts

@@ -441,7 +441,7 @@ class Auth {
             );
           } else {
             const contentTypeHeaderOrHeaders = result.headers!['content-type'] ?? null;
-            if (Utils.isArray(contentTypeHeaderOrHeaders)) {
+            if (Array.isArray(contentTypeHeaderOrHeaders)) {
               // Combine multiple header values into a comma-separated list per https://datatracker.ietf.org/doc/html/rfc9110#section-5.2; see https://github.com/ably/ably-js/issues/1616 for doing this consistently across the codebase.
               contentType = contentTypeHeaderOrHeaders.join(', ');
             } else {
@@ -830,7 +830,7 @@ class Auth {
   }
 
   getTimestampUsingOffset() {
-    return Utils.now() + (this.client.serverTimeOffset || 0);
+    return Date.now() + (this.client.serverTimeOffset || 0);
   }
 
   isTimeOffsetSet() {

src/common/lib/client/baserealtime.ts

@@ -154,7 +154,7 @@ class Channels extends EventEmitter {
 
     for (const channelId in this.all) {
       const channel = this.all[channelId];
-      if (Utils.arrIn(fromChannelStates, channel.state)) {
+      if (fromChannelStates.includes(channel.state)) {
         channel.notifyState(toChannelState, reason);
       }
     }

src/common/lib/client/realtimechannel.ts

@@ -45,15 +45,15 @@ function validateChannelOptions(options?: API.ChannelOptions) {
     return new ErrorInfo('options.params must be an object', 40000, 400);
   }
   if (options && 'modes' in options) {
-    if (!Utils.isArray(options.modes)) {
+    if (!Array.isArray(options.modes)) {
       return new ErrorInfo('options.modes must be an array', 40000, 400);
     }
     for (let i = 0; i < options.modes.length; i++) {
       const currentMode = options.modes[i];
       if (
         !currentMode ||
         typeof currentMode !== 'string' ||
-        !Utils.arrIn(channelModes, String.prototype.toUpperCase.call(currentMode))
+        !channelModes.includes(String.prototype.toUpperCase.call(currentMode))
       ) {
         return new ErrorInfo('Invalid channel mode: ' + currentMode, 40000, 400);
       }
@@ -222,7 +222,7 @@ class RealtimeChannel extends EventEmitter {
     }
     if (argCount == 1) {
       if (Utils.isObject(messages)) messages = [messageFromValues(messages)];
-      else if (Utils.isArray(messages)) messages = messagesFromValuesArray(messages);
+      else if (Array.isArray(messages)) messages = messagesFromValuesArray(messages);
       else
         throw new ErrorInfo(
           'The single-argument form of publish() expects a message object or an array of message objects',
@@ -467,7 +467,7 @@ class RealtimeChannel extends EventEmitter {
     const msg = protocolMessageFromValues({
       action: actions.PRESENCE,
       channel: this.name,
-      presence: Utils.isArray(presence)
+      presence: Array.isArray(presence)
         ? this.client._RealtimePresence!.presenceMessagesFromValuesArray(presence)
         : [this.client._RealtimePresence!.presenceMessageFromValues(presence)],
     });
@@ -696,7 +696,7 @@ class RealtimeChannel extends EventEmitter {
     this.clearStateTimer();
 
     // RTP5a1
-    if (Utils.arrIn(['detached', 'suspended', 'failed'], state)) {
+    if (['detached', 'suspended', 'failed'].includes(state)) {
       this.properties.channelSerial = null;
     }
 

src/common/lib/client/realtimepresence.ts

@@ -445,14 +445,14 @@ class RealtimePresence extends EventEmitter {
 
   _synthesizeLeaves(items: PresenceMessage[]): void {
     const subscriptions = this.subscriptions;
-    Utils.arrForEach(items, function (item) {
+    items.forEach(function (item) {
       const presence = presenceMessageFromValues({
         action: 'leave',
         connectionId: item.connectionId,
         clientId: item.clientId,
         data: item.data,
         encoding: item.encoding,
-        timestamp: Utils.now(),
+        timestamp: Date.now(),
       });
       subscriptions.emit('leave', presence);
     });

src/common/lib/client/rest.ts

@@ -86,7 +86,7 @@ export class Rest {
       throw new ErrorInfo('Internal error (unexpected result type from GET /time)', 50000, 500);
     }
     /* calculate time offset only once for this device by adding to the prototype */
-    this.client.serverTimeOffset = time - Utils.now();
+    this.client.serverTimeOffset = time - Date.now();
     return time;
   }
 
@@ -134,11 +134,11 @@ export class Rest {
       /* useHttpPaginatedResponse: */ true
     );
 
-    if (!Utils.arrIn(Platform.Http.methods, _method)) {
+    if (!Platform.Http.methods.includes(_method)) {
       throw new ErrorInfo('Unsupported method ' + _method, 40500, 405);
     }
 
-    if (Utils.arrIn(Platform.Http.methodsWithBody, _method)) {
+    if (Platform.Http.methodsWithBody.includes(_method)) {
       return paginatedResource[_method as HttpMethods.Post](params, body as RequestBody) as Promise<
         HttpPaginatedResponse<unknown>
       >;
@@ -154,7 +154,7 @@ export class Rest {
   ): Promise<T extends BatchPublishSpec ? BatchPublishResult : BatchPublishResult[]> {
     let requestBodyDTO: BatchPublishSpec[];
     let singleSpecMode: boolean;
-    if (Utils.isArray(specOrSpecs)) {
+    if (Array.isArray(specOrSpecs)) {
       requestBodyDTO = specOrSpecs;
       singleSpecMode = false;
     } else {

src/common/lib/client/restchannel.ts

@@ -22,7 +22,7 @@ import { RequestBody } from 'common/types/http';
 const MSG_ID_ENTROPY_BYTES = 9;
 
 function allEmptyIds(messages: Array<Message>) {
-  return Utils.arrEvery(messages, function (message: Message) {
+  return messages.every(function (message: Message) {
     return !message.id;
   });
 }
@@ -63,7 +63,7 @@ class RestChannel {
     } else if (Utils.isObject(first)) {
       messages = [messageFromValues(first)];
       params = args[1];
-    } else if (Utils.isArray(first)) {
+    } else if (Array.isArray(first)) {
       messages = messagesFromValuesArray(first);
       params = args[1];
     } else {
@@ -88,8 +88,8 @@ class RestChannel {
     Utils.mixin(headers, options.headers);
 
     if (idempotentRestPublishing && allEmptyIds(messages)) {
-      const msgIdBase = Utils.randomString(MSG_ID_ENTROPY_BYTES);
-      Utils.arrForEach(messages, function (message, index) {
+      const msgIdBase = await Utils.randomString(MSG_ID_ENTROPY_BYTES);
+      messages.forEach(function (message, index) {
         message.id = msgIdBase + ':' + index.toString();
       });
     }

src/common/lib/transport/comettransport.ts

@@ -21,7 +21,7 @@ function shouldBeErrorAction(err: ErrorInfo) {
   const UNRESOLVABLE_ERROR_CODES = [80015, 80017, 80030];
   if (err.code) {
     if (Auth.isTokenErr(err)) return false;
-    if (Utils.arrIn(UNRESOLVABLE_ERROR_CODES, err.code)) return true;
+    if (UNRESOLVABLE_ERROR_CODES.includes(err.code)) return true;
     return err.code >= 40000 && err.code < 50000;
   } else {
     /* Likely a network or transport error of some kind. Certainly not fatal to the connection */

src/common/lib/transport/connectionmanager.ts

@@ -44,8 +44,8 @@ function clearSessionRecoverData() {
 
 function betterTransportThan(a: Transport, b: Transport) {
   return (
-    Utils.arrIndexOf(Platform.Defaults.transportPreferenceOrder, a.shortName) >
-    Utils.arrIndexOf(Platform.Defaults.transportPreferenceOrder, b.shortName)
+    Platform.Defaults.transportPreferenceOrder.indexOf(a.shortName) >
+    Platform.Defaults.transportPreferenceOrder.indexOf(b.shortName)
   );
 }
 
@@ -75,7 +75,7 @@ function bundleWith(dest: ProtocolMessage, src: ProtocolMessage, maxSize: number
     return false;
   }
   if (
-    !Utils.arrEvery(proposed, function (msg: Message) {
+    !proposed.every(function (msg: Message) {
       return !msg.id;
     })
   ) {
@@ -346,7 +346,6 @@ class ConnectionManager extends EventEmitter {
     if (addEventListener) {
       /* intercept close event in browser to persist connection id if requested */
       if (haveSessionStorage() && typeof options.recover === 'function') {
-        /* Usually can't use bind as not supported in IE8, but IE doesn't support sessionStorage, so... */
         addEventListener('beforeunload', this.persistConnection.bind(this));
       }
 
@@ -416,7 +415,7 @@ class ConnectionManager extends EventEmitter {
     if (initialiseWebSocketTransport) {
       initialiseWebSocketTransport(storage);
     }
-    Utils.arrForEach(Platform.Transports.order, function (transportName) {
+    Platform.Transports.order.forEach(function (transportName) {
       const initFn = implementations[transportName];
       if (initFn) {
         initFn(storage);
@@ -591,7 +590,7 @@ class ConnectionManager extends EventEmitter {
         /*  if ws and xhrs are connecting in parallel, delay xhrs activation to let ws go ahead */
         if (
           transport.shortName !== optimalTransport &&
-          Utils.arrIn(this.getUpgradePossibilities(), optimalTransport) &&
+          this.getUpgradePossibilities().includes(optimalTransport) &&
           this.activeProtocol
         ) {
           setTimeout(() => {
@@ -930,9 +929,9 @@ class ConnectionManager extends EventEmitter {
       }
     }
 
-    /* Terminate any other pending transport(s), and
-     * abort any not-yet-pending transport attempts */
-    Utils.safeArrForEach(this.pendingTransports, (pendingTransport) => {
+    // terminate any other pending transport(s), and abort any not-yet-pending transport attempts
+    // need to use .slice() here, since we intend to mutate the array during .forEach() iteration
+    this.pendingTransports.slice().forEach((pendingTransport) => {
       if (pendingTransport === transport) {
         const msg =
           'Assumption violated: activating a transport that is still marked as a pending transport; transport = ' +
@@ -945,7 +944,8 @@ class ConnectionManager extends EventEmitter {
         pendingTransport.disconnect();
       }
     });
-    Utils.safeArrForEach(this.proposedTransports, (proposedTransport: Transport) => {
+    // need to use .slice() here, since we intend to mutate the array during .forEach() iteration
+    this.proposedTransports.slice().forEach((proposedTransport: Transport) => {
       if (proposedTransport === transport) {
         Logger.logAction(
           Logger.LOG_ERROR,
@@ -1132,7 +1132,7 @@ class ConnectionManager extends EventEmitter {
       return;
     }
 
-    const sinceLast = Utils.now() - this.lastActivity;
+    const sinceLast = Date.now() - this.lastActivity;
     if (sinceLast > this.connectionStateTtl + (this.maxIdleInterval as number)) {
       Logger.logAction(
         Logger.LOG_MINOR,
@@ -1154,7 +1154,7 @@ class ConnectionManager extends EventEmitter {
       if (recoveryKey) {
         setSessionRecoverData({
           recoveryKey: recoveryKey,
-          disconnectedAt: Utils.now(),
+          disconnectedAt: Date.now(),
           location: globalObject.location,
           clientId: this.realtime.auth.clientId,
         });
@@ -1358,11 +1358,11 @@ class ConnectionManager extends EventEmitter {
     if (retryImmediately) {
       const autoReconnect = () => {
         if (this.state === this.states.disconnected) {
-          this.lastAutoReconnectAttempt = Utils.now();
+          this.lastAutoReconnectAttempt = Date.now();
           this.requestState({ state: 'connecting' });
         }
       };
-      const sinceLast = this.lastAutoReconnectAttempt && Utils.now() - this.lastAutoReconnectAttempt + 1;
+      const sinceLast = this.lastAutoReconnectAttempt && Date.now() - this.lastAutoReconnectAttempt + 1;
       if (sinceLast && sinceLast < 1000) {
         Logger.logAction(
           Logger.LOG_MICRO,
@@ -1559,7 +1559,7 @@ class ConnectionManager extends EventEmitter {
     const preference = this.getTransportPreference();
     let preferenceTimeoutExpired = false;
 
-    if (!Utils.arrIn(this.transports, preference)) {
+    if (!this.transports.includes(preference)) {
       this.unpersistTransportPreference();
       this.connectImpl(transportParams, connectCount);
     }
@@ -1696,7 +1696,7 @@ class ConnectionManager extends EventEmitter {
      * transport in upgradeTransports (if it's in there - if not, currentSerial
      * will be -1, so return upgradeTransports.slice(0) == upgradeTransports */
     const current = (this.activeProtocol as Protocol).getTransport().shortName;
-    const currentSerial = Utils.arrIndexOf(this.upgradeTransports, current);
+    const currentSerial = this.upgradeTransports.indexOf(current);
     return this.upgradeTransports.slice(currentSerial + 1);
   }
 
@@ -1712,7 +1712,7 @@ class ConnectionManager extends EventEmitter {
       return;
     }
 
-    Utils.arrForEach(upgradePossibilities, (upgradeTransport: TransportName) => {
+    upgradePossibilities.forEach((upgradeTransport: TransportName) => {
       /* Note: the transport may mutate the params, so give each transport a fresh one */
       const upgradeTransportParams = this.createTransportParams(transportParams.host, 'upgrade');
       this.tryATransport(upgradeTransportParams, upgradeTransport, noop);
@@ -1724,12 +1724,14 @@ class ConnectionManager extends EventEmitter {
     this.cancelSuspendTimer();
     this.startTransitionTimer(this.states.closing);
 
-    Utils.safeArrForEach(this.pendingTransports, function (transport) {
+    // need to use .slice() here, since we intend to mutate the array during .forEach() iteration
+    this.pendingTransports.slice().forEach(function (transport) {
       Logger.logAction(Logger.LOG_MICRO, 'ConnectionManager.closeImpl()', 'Closing pending transport: ' + transport);
       if (transport) transport.close();
     });
 
-    Utils.safeArrForEach(this.proposedTransports, function (transport) {
+    // need to use .slice() here, since we intend to mutate the array during .forEach() iteration
+    this.proposedTransports.slice().forEach(function (transport) {
       Logger.logAction(
         Logger.LOG_MICRO,
         'ConnectionManager.closeImpl()',
@@ -1865,7 +1867,8 @@ class ConnectionManager extends EventEmitter {
     /* This will prevent any connection procedure in an async part of one of its early stages from continuing */
     this.connectCounter++;
 
-    Utils.safeArrForEach(this.pendingTransports, function (transport) {
+    // need to use .slice() here, since we intend to mutate the array during .forEach() iteration
+    this.pendingTransports.slice().forEach(function (transport) {
       Logger.logAction(
         Logger.LOG_MICRO,
         'ConnectionManager.disconnectAllTransports()',
@@ -1875,7 +1878,8 @@ class ConnectionManager extends EventEmitter {
     });
     this.pendingTransports = [];
 
-    Utils.safeArrForEach(this.proposedTransports, function (transport) {
+    // need to use .slice() here, since we intend to mutate the array during .forEach() iteration
+    this.proposedTransports.slice().forEach(function (transport) {
       Logger.logAction(
         Logger.LOG_MICRO,
         'ConnectionManager.disconnectAllTransports()',
@@ -2026,7 +2030,7 @@ class ConnectionManager extends EventEmitter {
 
   private async processChannelMessage(message: ProtocolMessage, transport: Transport) {
     const onActiveTransport = this.activeProtocol && transport === this.activeProtocol.getTransport(),
-      onUpgradeTransport = Utils.arrIn(this.pendingTransports, transport) && this.state == this.states.synchronizing;
+      onUpgradeTransport = this.pendingTransports.includes(transport) && this.state == this.states.synchronizing;
 
     /* As the lib now has a period where the upgrade transport is synced but
      * before it's become active (while waiting for the old one to become
@@ -2037,7 +2041,7 @@ class ConnectionManager extends EventEmitter {
       // Message came in on a defunct transport. Allow only acks, nacks, & errors for outstanding
       // messages,  no new messages (as sync has been sent on new transport so new messages will
       // be resent there, or connection has been closed so don't want new messages)
-      if (Utils.arrIndexOf([actions.ACK, actions.NACK, actions.ERROR], message.action) > -1) {
+      if ([actions.ACK, actions.NACK, actions.ERROR].includes(message.action!)) {
         await this.realtime.channels.processChannelMessage(message);
       } else {
         Logger.logAction(
@@ -2059,14 +2063,14 @@ class ConnectionManager extends EventEmitter {
         callback(new ErrorInfo('Timeout waiting for heartbeat response', 50000, 500));
       };
 
-      const pingStart = Utils.now(),
+      const pingStart = Date.now(),
         id = Utils.cheapRandStr();
 
       const onHeartbeat = function (responseId: string) {
         if (responseId === id) {
           transport.off('heartbeat', onHeartbeat);
           clearTimeout(timer);
-          const responseTime = Utils.now() - pingStart;
+          const responseTime = Date.now() - pingStart;
           callback(null, responseTime);
         }
       };
@@ -2124,7 +2128,7 @@ class ConnectionManager extends EventEmitter {
   }
 
   persistTransportPreference(transport: Transport): void {
-    if (Utils.arrIn(Defaults.upgradeTransports, transport.shortName)) {
+    if (Defaults.upgradeTransports.includes(transport.shortName)) {
       this.transportPreference = transport.shortName;
       if (haveWebStorage()) {
         Platform.WebStorage?.set?.(transportPreferenceName, transport.shortName);