@live-change/peer-connection-service 0.9.197 → 0.9.199

package/config.js

@@ -0,0 +1,24 @@
+import definition from './definition.js'
+
+const {
+  readerRoles = ['reader', 'speaker', 'vip', 'moderator', 'owner', 'member'],
+  writerRoles = ['speaker', 'vip', 'moderator', 'owner'],
+  messageWaitForEvents = false,
+  messageSkipEmit = false,
+  groupMessages = false
+} = definition.config
+
+definition.clientConfig = {
+  readerRoles,
+  writerRoles
+}
+
+const config = {
+  readerRoles,
+  writerRoles,
+  messageWaitForEvents,
+  messageSkipEmit,
+  groupMessages
+}
+
+export default config

package/message.js

@@ -1,13 +1,5 @@
 import definition from './definition.js'
-const config = definition.config
-const {
-  readerRoles = ['reader', 'speaker', 'vip', 'moderator', 'owner'],
-  writerRoles = ['speaker', 'vip', 'moderator', 'owner'],
-  messageWaitForEvents = false,
-  messageSkipEmit = false,
-  groupMessages = false
-} = config
-
+import config from './config.js'
 
 import accessControl from '@live-change/access-control-service/access.js'
 const { clientHasAccessRoles } = accessControl(definition)
@@ -148,7 +140,7 @@ async function postMessage(props, { client, service }, emit) {
   if(!data.user) {
     data.session = client.session
   }
-  if(messageSkipEmit) {
+  if(config.messageSkipEmit) {
     await Message.create({
       id: message,
       ...data
@@ -175,12 +167,12 @@ definition.action({
     //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)
+    const hasRole = await clientHasAccessRoles(client, { objectType: toType, object: toId }, config.writerRoles)
     return hasRole
   },
   queuedBy: (props) => props.from+':'+props.to, // without this, messages order can be changed
   // and it will block ice connection state
-  waitForEvents: messageWaitForEvents,
+  waitForEvents: config.messageWaitForEvents,
   async execute(props, { client, service }, emit) {
     console.error('postMessage is deprecated, use postMessages instead')
     await postMessage(props, { client, service }, emit)
@@ -216,16 +208,16 @@ definition.action({
    // 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)
+    const hasRole = await clientHasAccessRoles(client, { objectType: toType, object: toId }, config.writerRoles)
     return hasRole
   },
   queuedBy: (props) => props.from+':'+props.to, // without this, messages order can be changed
                                                       // and it will block ice connection state
-  waitForEvents: messageWaitForEvents,
+  waitForEvents: config.messageWaitForEvents,
   async execute(props, { client, service }, emit) {
     let lastSent = ''
     let lastMessages
-    if(messageWaitForEvents) {
+    if(config.messageWaitForEvents) {
       lastMessages = await Message.rangeGet({
         gte: `${props.to}_`,
         lte: `${props.to}_\xFF\xFF\xFF\xFF`,
@@ -236,7 +228,7 @@ definition.action({
     }
     const messages = props.messages
     for(const message of messages) {
-      if(messageWaitForEvents) {
+      if(config.messageWaitForEvents) {
         const sent = new Date(message.sent).toISOString()
         if(lastSent > sent) {
           console.error("Message out of order", lastSent, '>', sent, "BY", props.from)
@@ -248,7 +240,7 @@ definition.action({
         lastSent = sent
       }
     }
-    if(groupMessages) {
+    if(config.groupMessages) {
       await postMessage({
         from: props.from,
         to: props.to,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/peer-connection-service",
-  "version": "0.9.197",
+  "version": "0.9.199",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -11,5 +11,5 @@
   },
   "author": "Michał Łaszczewski <michal@emikse.com>",
   "license": "BSD-3-Clause",
-  "gitHead": "8231c2ed8bc3beed2c732aa5727174417f19082b"
+  "gitHead": "1900043a10cf9ad49b9cc33a539fb973706de962"
 }

package/peer.js

@@ -2,11 +2,7 @@ import App from '@live-change/framework'
 const app = App.app()
 
 import definition from './definition.js'
-const config = definition.config
-const {
-  readerRoles = ['reader', 'speaker', 'vip', 'moderator', 'owner', 'member'].
-  writerRoles = ['speaker', 'vip', 'moderator', 'owner']
-} = config
+import config from './config.js'
 
 import accessControl from '@live-change/access-control-service/access.js'
 const { clientHasAccessRoles } = accessControl(definition)
@@ -42,7 +38,7 @@ definition.view({
     if(visibilityTest) return true
     const { channelType, channel } = params
     //console.log("CHECK PEERS ACCESS", params, client, visibilityTest)
-    return clientHasAccessRoles(client, { objectType: channelType, object: channel }, readerRoles)
+    return clientHasAccessRoles(client, { objectType: channelType, object: channel }, config.readerRoles)
   },
   async daoPath({ channelType, channel }, { client, service }, method) {
     return Peer.indexRangePath('byChannel', [ channelType, channel.split(':')[0] ])

package/peerState.js

@@ -1,9 +1,5 @@
 import definition from './definition.js'
-const config = definition.config
-const {
-  readerRoles = ['reader', 'speaker', 'vip', 'moderator', 'owner'],
-  writerRoles = ['speaker', 'vip', 'moderator', 'owner']
-} = config
+import config from './config.js'
 
 import accessControl from '@live-change/access-control-service/access.js'
 const { clientHasAccessRoles } = accessControl(definition)
@@ -61,7 +57,7 @@ definition.action({
     if(visibilityTest) return true
     const [toType, toId, toSession] = peer.split(':')
     if(client.session !== toSession) return false
-    const hasRole = await clientHasAccessRoles(client, { objectType: toType, object: toId }, writerRoles)
+    const hasRole = await clientHasAccessRoles(client, { objectType: toType, object: toId }, config.writerRoles)
     return hasRole
   },
   async execute(props, { client, service }, emit) {

package/turn.js

@@ -7,11 +7,6 @@ const urls = config?.turn?.urls || process.env.TURN_URLS?.split(';')
 const secret = config?.turn?.secret || process.env.TURN_SECRET
 const turnExpireTime = config?.turn?.expire || (+process.env.TURN_EXPIRE) || (60 * 60) // 1 hour for default
 
-const {
-  readerRoles = ['reader', 'speaker', 'vip', 'moderator', 'owner'],
-  writerRoles = ['speaker', 'vip', 'moderator', 'owner']
-} = config
-
 import accessControl from '@live-change/access-control-service/access.js'
 const { clientHasAccessRoles } = accessControl(definition)
 
@@ -65,7 +60,7 @@ definition.view({
     const [ channelType, channel, session, instance ] = peer.split(':')
     if(session !== client.session) throw new Error('wrongSession')
     const result = await clientHasAccessRoles(client, { objectType: channelType.split('.')[0], object: channel },
-        writerRoles)
+        config.writerRoles)
     return result
   },
   observable({ peer }, context) {