@live-change/peer-connection-service 0.8.109 → 0.8.111

package/message.js

@@ -23,6 +23,9 @@ const messageFields = {
   },
   data: {
     type: Object
+  },
+  sent: {
+    type: Date
   }
 }
 
@@ -40,13 +43,16 @@ const Message = definition.model({
       property: ['to', 'timestamp']
     },*/
   },
-  crud: {
-    deleteTrigger: true,
-    writeOptions: {
-      access: (params, {client, service}) => {
-        return client.roles.includes('admin')
-      }
-    }
+})
+
+definition.event({
+  name: "MessageCreated",
+  async execute({ message, data }, { client, service }) {
+    if(data.id) delete data.id
+    await Message.create({
+      id: message,
+      ...data
+    })
   }
 })
 
@@ -110,7 +116,7 @@ definition.view({
 
 let lastMessageTime = new Map()
 
-async function postMessage(props, { client, service }, emit, conversation) {
+function postMessage(props, { client, service }, emit, conversation) {
   console.log("POST MESSAGE", props)
   const channelId = props.to
   let lastTime = lastMessageTime.get(channelId)
@@ -151,15 +157,83 @@ definition.action({
     if(visibilityTest) return true
     const [fromType, fromId, fromSession] = from.split(':')
     const [toType, toId, toSession] = to.split(':')
-    console.log("POST MESSAGE", fromType, fromId, fromSession, '=>', toType, toId, toSession, "BY", client)
+    //console.log("POST MESSAGE", fromType, fromId, fromSession, '=>', toType, toId, toSession, "BY", client)
     if(toType !== fromType || toId !== fromId) return false // different channel
     if(client.session !== fromSession) return false
     const hasRole = await clientHasAccessRoles(client, { objectType: toType, object: toId }, writerRoles)
     return hasRole
   },
+  queuedBy: (props) => props.from+':'+props.to, // without this, messages order can be changed
+  // and it will block ice connection state
   async execute(props, { client, service }, emit) {
-    const result = await postMessage(props, { client, service }, emit)
+    console.error('postMessage is deprecated, use postMessages instead')
+    const result = postMessage(props, { client, service }, emit)
     console.log("MESSAGE POSTED!")
     return result
   }
 })
+
+
+definition.action({
+  name: "postMessages",
+  properties: {
+    from: {
+      type: Peer,
+      validation: ['nonEmpty']
+    },
+    to: {
+      type: Peer,
+      validation: ['nonEmpty']
+    },
+    messages: {
+      type: Array,
+      of: {
+        type: Object,
+        messageFields
+      }
+    }
+  },
+  //queuedBy: (command) => `${command.toType}_${command.toId})`,
+  access: async ({ from, to }, context) => {
+    const { client, service, visibilityTest } = context
+    if(visibilityTest) return true
+    const [fromType, fromId, fromSession] = from.split(':')
+    const [toType, toId, toSession] = to.split(':')
+   // console.log("POST MESSAGE", fromType, fromId, fromSession, '=>', toType, toId, toSession, "BY", client)
+    if(toType !== fromType || toId !== fromId) return false // different channel
+    if(client.session !== fromSession) return false
+    const hasRole = await clientHasAccessRoles(client, { objectType: toType, object: toId }, writerRoles)
+    return hasRole
+  },
+  queuedBy: (props) => props.from+':'+props.to, // without this, messages order can be changed
+                                                      // and it will block ice connection state
+  //waitForEvents: true,
+  async execute(props, { client, service }, emit) {
+    const lastMessages = await Message.rangeGet({
+      gte: `${props.to}_`,
+      lte: `${props.to}_\xFF\xFF\xFF\xFF`,
+      limit: 10,
+      reverse: true
+    })
+    let lastSent = lastMessages?.[0]?.sent
+    const messages = props.messages
+    for(const message of messages) {
+      message.from = props.from
+      message.to = props.to
+      const sent = new Date(message.sent).toISOString()
+      if(lastSent > sent) {
+        console.error("Message out of order", lastSent, '>', sent, "BY", props.from)
+        console.error("LAST MESSAGES", lastMessages)
+        console.error("RECEIVED MESSAGES", props.messages)
+       // process.exit(1)
+        throw new Error("Messages out of order")
+      }
+      lastSent = sent
+    }
+    for(const message of messages) {
+      postMessage(message, { client, service }, emit)
+    }
+   // console.log("MESSAGES POSTED!")
+    return 'ok'
+  }
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/peer-connection-service",
-  "version": "0.8.109",
+  "version": "0.8.111",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -11,5 +11,5 @@
   },
   "author": "Michał Łaszczewski <michal@emikse.com>",
   "license": "BSD-3-Clause",
-  "gitHead": "075bf3759fae6c40fb8e44d77d9f12c5c175e098"
+  "gitHead": "9b96afb2fc61ab3d2a5d143924e2c56d411280b4"
 }

package/turn.js

@@ -28,6 +28,7 @@ function randomHexString(size) {
 }
 
 async function createTurnConfiguration({ client }) {
+  if(!urls || !secret) return null
   if(!urls) throw new Error('TURN urls not configured')
   if(!secret) throw new Error('TURN secret not configured')
   const expire = Date.now() / 1000 + turnExpireTime | 0