Change statemessage.ts filename to objectmessage.ts

Author: VeskeR

scripts/moduleReport.ts

@@ -331,9 +331,9 @@ async function checkObjectsPluginFiles() {
     'src/plugins/objects/livemap.ts',
     'src/plugins/objects/liveobject.ts',
     'src/plugins/objects/objectid.ts',
+    'src/plugins/objects/objectmessage.ts',
     'src/plugins/objects/objects.ts',
     'src/plugins/objects/objectspool.ts',
-    'src/plugins/objects/statemessage.ts',
     'src/plugins/objects/syncobjectsdatapool.ts',
   ]);
 

src/plugins/objects/batchcontext.ts

@@ -4,9 +4,9 @@ import { BatchContextLiveCounter } from './batchcontextlivecounter';
 import { BatchContextLiveMap } from './batchcontextlivemap';
 import { LiveCounter } from './livecounter';
 import { LiveMap } from './livemap';
+import { ObjectMessage } from './objectmessage';
 import { Objects } from './objects';
 import { ROOT_OBJECT_ID } from './objectspool';
-import { ObjectMessage } from './statemessage';
 
 export class BatchContext {
   private _client: BaseClient;

src/plugins/objects/index.ts

@@ -1,5 +1,5 @@
+import { ObjectMessage } from './objectmessage';
 import { Objects } from './objects';
-import { ObjectMessage } from './statemessage';
 
 export { Objects, ObjectMessage };
 

src/plugins/objects/livecounter.ts

@@ -1,7 +1,7 @@
 import { LiveObject, LiveObjectData, LiveObjectUpdate, LiveObjectUpdateNoop } from './liveobject';
 import { ObjectId } from './objectid';
+import { CounterOp, ObjectMessage, ObjectOperation, ObjectOperationAction, ObjectState } from './objectmessage';
 import { Objects } from './objects';
-import { CounterOp, ObjectMessage, ObjectOperation, ObjectOperationAction, ObjectState } from './statemessage';
 
 export interface LiveCounterData extends LiveObjectData {
   data: number;

src/plugins/objects/livemap.ts

@@ -4,17 +4,17 @@ import type * as API from '../../../ably';
 import { DEFAULTS } from './defaults';
 import { LiveObject, LiveObjectData, LiveObjectUpdate, LiveObjectUpdateNoop } from './liveobject';
 import { ObjectId } from './objectid';
-import { Objects } from './objects';
 import {
-  MapSemantics,
   MapEntry,
   MapOp,
+  MapSemantics,
   ObjectMessage,
-  ObjectState,
   ObjectOperation,
   ObjectOperationAction,
+  ObjectState,
   ObjectValue,
-} from './statemessage';
+} from './objectmessage';
+import { Objects } from './objects';
 
 export interface ObjectIdObjectData {
   /** A reference to another object, used to support composable object structures. */

src/plugins/objects/liveobject.ts

@@ -1,7 +1,7 @@
 import type BaseClient from 'common/lib/client/baseclient';
 import type EventEmitter from 'common/lib/util/eventemitter';
+import { ObjectMessage, ObjectOperation, ObjectState } from './objectmessage';
 import { Objects } from './objects';
-import { ObjectMessage, ObjectState, ObjectOperation } from './statemessage';
 
 export enum LiveObjectSubscriptionEvent {
   updated = 'updated',

src/plugins/objects/statemessage.ts src/plugins/objects/objectmessage.tssrc/plugins/objects/statemessage.ts renamed to src/plugins/objects/objectmessage.ts

@@ -148,6 +148,7 @@ export class ObjectMessage {
   timestamp?: number;
   clientId?: string;
   connectionId?: string;
+  // TODO: remove, see Simon's comment in PR: https://github.com/ably/specification/pull/279#discussion_r1996035652
   channel?: string;
   extras?: any;
   /**
@@ -301,6 +302,11 @@ export class ObjectMessage {
     inputContext: ChannelOptions,
     messageEncoding: typeof MessageEncoding,
   ): Promise<void> {
+    // TODO: fix for root with deleted keys, "data" field (ObjectData) can be undefined, so it throws here
+    if (!objectData) {
+      return;
+    }
+
     const { data, encoding, error } = await messageEncoding.decodeData(
       objectData.value,
       objectData.encoding,

src/plugins/objects/objects.ts

@@ -7,8 +7,8 @@ import { DEFAULTS } from './defaults';
 import { LiveCounter } from './livecounter';
 import { LiveMap } from './livemap';
 import { LiveObject, LiveObjectUpdate, LiveObjectUpdateNoop } from './liveobject';
+import { ObjectMessage, ObjectOperationAction } from './objectmessage';
 import { ObjectsPool, ROOT_OBJECT_ID } from './objectspool';
-import { ObjectMessage, ObjectOperationAction } from './statemessage';
 import { SyncObjectsDataPool } from './syncobjectsdatapool';
 
 export enum ObjectsEvent {

src/plugins/objects/syncobjectsdatapool.ts

@@ -1,7 +1,7 @@
 import type BaseClient from 'common/lib/client/baseclient';
 import type RealtimeChannel from 'common/lib/client/realtimechannel';
+import { ObjectMessage, ObjectState } from './objectmessage';
 import { Objects } from './objects';
-import { ObjectMessage, ObjectState } from './statemessage';
 
 export interface LiveObjectDataEntry {
   objectState: ObjectState;