@hocuspocus/provider 1.0.0-alpha.12 → 1.0.0-alpha.16

package/src/IncomingMessage.ts

@@ -9,6 +9,7 @@ import {
   createEncoder,
   writeVarUint,
   writeVarUint8Array,
+  length,
 } from 'lib0/encoding'
 import { MessageType } from './types'
 
@@ -41,4 +42,8 @@ export class IncomingMessage {
   writeVarUint8Array(data: Uint8Array) {
     return writeVarUint8Array(this.encoder, data)
   }
+
+  length() {
+    return length(this.encoder)
+  }
 }

package/src/MessageReceiver.ts

@@ -4,17 +4,27 @@ import { MessageType } from './types'
 import { HocuspocusProvider } from './HocuspocusProvider'
 import { IncomingMessage } from './IncomingMessage'
 import { readAuthMessage } from '../../../shared/protocols/auth'
+import { OutgoingMessage } from './OutgoingMessage'
 
 export class MessageReceiver {
 
   message: IncomingMessage
 
+  broadcasted = false
+
   constructor(message: IncomingMessage) {
     this.message = message
   }
 
+  public setBroadcasted(value: boolean) {
+    this.broadcasted = value
+
+    return this
+  }
+
   public apply(provider: HocuspocusProvider, emitSynced = true) {
-    const type = this.message.readVarUint()
+    const { message } = this
+    const type = message.readVarUint()
 
     switch (type) {
       case MessageType.Sync:
@@ -36,6 +46,19 @@ export class MessageReceiver {
       default:
         throw new Error(`Can’t apply message of unknown type: ${type}`)
     }
+
+    // Reply
+    if (message.length() > 1) {
+      if (this.broadcasted) {
+        // TODO: Some weird TypeScript error
+        // @ts-ignore
+        provider.broadcast(OutgoingMessage, { encoder: message.encoder })
+      } else {
+        // TODO: Some weird TypeScript error
+        // @ts-ignore
+        provider.send(OutgoingMessage, { encoder: message.encoder })
+      }
+    }
   }
 
   private applySyncMessage(provider: HocuspocusProvider, emitSynced: boolean) {
@@ -43,6 +66,7 @@ export class MessageReceiver {
 
     message.writeVarUint(MessageType.Sync)
 
+    // Apply update
     const syncMessageType = readSyncMessage(
       message.decoder,
       message.encoder,
@@ -50,6 +74,7 @@ export class MessageReceiver {
       provider,
     )
 
+    // Synced once we receive Step2
     if (emitSynced && syncMessageType === messageYjsSyncStep2) {
       provider.synced = true
     }

package/src/MessageSender.ts

@@ -1,12 +1,6 @@
 import { Encoder, toUint8Array } from 'lib0/encoding'
 import * as bc from 'lib0/broadcastchannel'
-import { AuthenticationMessage } from './OutgoingMessages/AuthenticationMessage'
-import { AwarenessMessage } from './OutgoingMessages/AwarenessMessage'
-import { QueryAwarenessMessage } from './OutgoingMessages/QueryAwarenessMessage'
-import { SyncStepOneMessage } from './OutgoingMessages/SyncStepOneMessage'
-import { SyncStepTwoMessage } from './OutgoingMessages/SyncStepTwoMessage'
-import { UpdateMessage } from './OutgoingMessages/UpdateMessage'
-import { Constructable } from './types'
+import { ConstructableOutgoingMessage } from './types'
 
 export class MessageSender {
 
@@ -14,14 +8,7 @@ export class MessageSender {
 
   message: any
 
-  constructor(Message:
-    Constructable<AuthenticationMessage> |
-    Constructable<AwarenessMessage> |
-    Constructable<QueryAwarenessMessage> |
-    Constructable<SyncStepOneMessage> |
-    Constructable<SyncStepTwoMessage> |
-    Constructable<UpdateMessage>,
-  args: any = {}) {
+  constructor(Message: ConstructableOutgoingMessage, args: any = {}) {
     this.message = new Message()
     this.encoder = this.message.get(args)
   }

package/src/OutgoingMessage.ts

@@ -1,5 +1,5 @@
 import { Encoder, createEncoder, toUint8Array } from 'lib0/encoding'
-import { MessageType, OutgoingMessageInterface } from './types'
+import { MessageType, OutgoingMessageArguments, OutgoingMessageInterface } from './types'
 
 export class OutgoingMessage implements OutgoingMessageInterface {
   encoder: Encoder
@@ -10,6 +10,10 @@ export class OutgoingMessage implements OutgoingMessageInterface {
     this.encoder = createEncoder()
   }
 
+  get(args: Partial<OutgoingMessageArguments>) {
+    return args.encoder
+  }
+
   toUint8Array() {
     return toUint8Array(this.encoder)
   }

package/src/types.ts

@@ -1,6 +1,12 @@
 import { Awareness } from 'y-protocols/awareness'
 import * as Y from 'yjs'
-import * as encoding from 'lib0/encoding'
+import { Encoder } from 'lib0/encoding'
+import { AuthenticationMessage } from './OutgoingMessages/AuthenticationMessage'
+import { AwarenessMessage } from './OutgoingMessages/AwarenessMessage'
+import { QueryAwarenessMessage } from './OutgoingMessages/QueryAwarenessMessage'
+import { SyncStepOneMessage } from './OutgoingMessages/SyncStepOneMessage'
+import { SyncStepTwoMessage } from './OutgoingMessages/SyncStepTwoMessage'
+import { UpdateMessage } from './OutgoingMessages/UpdateMessage'
 
 export enum MessageType {
   Sync = 0,
@@ -10,7 +16,7 @@ export enum MessageType {
 }
 
 export interface OutgoingMessageInterface {
-  encoder: encoding.Encoder
+  encoder: Encoder
   type?: MessageType
 }
 
@@ -21,8 +27,17 @@ export interface OutgoingMessageArguments {
   clients: number[],
   states: Map<number, { [key: string]: any; }>,
   update: any,
+  encoder: Encoder,
 }
 
 export interface Constructable<T> {
   new(...args: any) : T
 }
+
+export type ConstructableOutgoingMessage =
+  Constructable<AuthenticationMessage> |
+  Constructable<AwarenessMessage> |
+  Constructable<QueryAwarenessMessage> |
+  Constructable<SyncStepOneMessage> |
+  Constructable<SyncStepTwoMessage> |
+  Constructable<UpdateMessage>