@live-change/peer-connection-service 0.8.34 → 0.8.35

package/index.js

@@ -3,7 +3,9 @@ const app = App.app()
 
 import definition from './definition.js'
 
-require('./turn.js')
-require('./peer.js')
+import './turn.js'
+import './peer.js'
+import './peerState.js'
+import './message.js'
 
 export default definition

package/message.js

@@ -1,4 +1,15 @@
-const Peer = require('./peer.js')
+import definition from './definition.js'
+const config = definition.config
+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)
+
+import { Peer } from './peer.js'
 
 const messageFields = {
   to: {
@@ -73,9 +84,8 @@ definition.view({
   access: async({ peer }, { client, service, visibilityTest }) => {
     if(visibilityTest) return true
     if(!peer) throw new Error("peer parameter is required")
-    const publicSessionInfo = await getPublicInfo(client.sessionId)
-    //console.log('MESSAGES ACCESS', peer.split('_'), "[2] == ", publicSessionInfo.id)
-    return peer.split('_')[2] == publicSessionInfo.id
+    console.log('MESSAGES ACCESS', peer.split(':'), "[2] == ", client.session)
+    return peer.split(':')[2] === client.session
   },
   async daoPath({ peer, gt, lt, gte, lte, limit, reverse }, { client, service }, method) {
     const channelId = peer
@@ -121,8 +131,7 @@ async function postMessage(props, { client, service }, emit, conversation) {
   }
   data.timestamp = now
   if(!data.user) {
-    const publicInfo = await getPublicInfo(client.sessionId)
-    data.session = publicInfo.id
+    data.session = client.session
   }
   emit({
     type: "MessageCreated",
@@ -140,15 +149,13 @@ definition.action({
   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('_')
-    if(toType != fromType) return false
-    if(toId != fromId) return false
-    const publicSessionInfo = await getPublicInfo(client.sessionId)
-    if(publicSessionInfo.id != fromSession) return false
-    return toType.split('.')[0] == 'priv'
-        ? checkPrivAccess(toId, context)
-        : checkIfRole(toType.split('.')[0], toId, ['speaker', 'vip', 'moderator', 'owner'], context)
+    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
   },
   async execute(props, { client, service }, emit) {
     const result = await postMessage(props, { client, service }, emit)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/peer-connection-service",
-  "version": "0.8.34",
+  "version": "0.8.35",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -11,5 +11,5 @@
   },
   "author": "Michał Łaszczewski <michal@emikse.com>",
   "license": "BSD-3-Clause",
-  "gitHead": "40e61928bf43b35352c76fc135f36a2d8bd76c4a"
+  "gitHead": "90fbb746dc7270895daf17b437ca48c0b0a01c01"
 }

package/peer.js

@@ -1,8 +1,14 @@
 import definition from './definition.js'
+const config = definition.config
+const {
+  readerRoles = ['reader', 'speaker', 'vip', 'moderator', 'owner'].
+  writerRoles = ['speaker', 'vip', 'moderator', 'owner']
+} = config
 
-const { clientHasAccessRole } = require("../access-control-service/access.js")(definition)
+import accessControl from '@live-change/access-control-service/access.js'
+const { clientHasAccessRoles } = accessControl(definition)
 
-const Peer = definition.model({
+export const Peer = definition.model({
   name: "Peer",
   itemOfAny: {
     to: ['channel', 'session']
@@ -33,8 +39,7 @@ definition.view({
     if(visibilityTest) return true
     const { channelType, channel } = params
     //console.log("CHECK PEERS ACCESS", params, client, visibilityTest)
-    return clientHasAccessRole(client, { objectType: channelType, object: channel },
-        ['reader', 'speaker', 'vip', 'moderator', 'owner'])
+    return clientHasAccessRoles(client, { objectType: channelType, object: channel }, readerRoles)
   },
   async daoPath({ channelType, channel }, { client, service }, method) {
     return Peer.indexRangePath('byChannel', [ channelType, channel.split('.')[0] ])
@@ -43,16 +48,16 @@ definition.view({
 
 definition.event({
   name: "peerOnline",
-  async execute({ channelType, channel, sessionType, session, instance }) {
-    const peer = channelType + ':' + channel + ':' + sessionType + ':' + session + ':' + instance
-    await Peer.create({ id: peer, channelType, channel, instance, sessionType, session })
+  async execute({ channelType, channel, session, instance }) {
+    const peer = channelType + ':' + channel + ':' + session + ':' + instance
+    await Peer.create({ id: peer, channelType, channel, instance, session })
   }
 })
 
 definition.event({
   name: "peerOffline",
-  async execute({ channelType, channel, sessionType, session, instance }) {
-    const peer = channelType + ':' + channel + ':' + sessionType + ':' + session + ':' + instance
+  async execute({ channelType, channel, session, instance }) {
+    const peer = channelType + ':' + channel + ':' + session + ':' + instance
     Peer.delete(peer)
   }
 })
@@ -76,13 +81,12 @@ definition.trigger({
   },
   async execute({ session, peer }, context, emit) {
     console.log("PEER ONLINE PARAMS", { session, peer })
-    const [ channelType, channel, sessionType, peerSession, instance ] = peer.split(':')
-    if(sessionType !== 'session_Session') throw new Error('wrongSessionType')
+    const [ channelType, channel, peerSession, instance ] = peer.split(':')
     if(peerSession !== session) throw new Error('wrongSession')
     /// TODO: check channel access
     emit({
       type: 'peerOnline',
-      channelType, channel, sessionType, session, instance
+      channelType, channel, session, instance
     })
   }
 })
@@ -93,12 +97,11 @@ definition.trigger({
   },
   async execute({ session, peer }, context, emit) {
     console.log("PEER OFFLINE PARAMS", { session, peer })
-    const [ channelType, channel, sessionType, peerSession, instance ] = peer.split(':')
-    if(sessionType != 'session_Session') throw new Error('wrongSessionType')
-    if(peerSession != session) throw new Error('wrongSession')
+    const [ channelType, channel, peerSession, instance ] = peer.split(':')
+    if(peerSession !== session) throw new Error('wrongSession')
     emit({
       type: 'peerOffline',
-      channelType, channel, sessionType, session, instance
+      channelType, channel, session, instance
     })
   }
 })

package/peerState.js

@@ -1,8 +1,20 @@
 import definition from './definition.js'
+const config = definition.config
+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)
+
+import { Peer } from './peer.js'
 
-const { Peer } = require('./peer.js')
 
 const peerStateFields = {
+  online: {
+    type: Boolean
+  },
   audioState: {
     type: String
   },
@@ -41,10 +53,9 @@ definition.view({
   access: async ({ peer }, context) => {
     const { client, service, visibilityTest } = context
     if(visibilityTest) return true
-    const [toType, toId, toSession] = peer.split('_')
-    return toType.split('.')[0] == 'priv'
-        ? checkPrivAccess(toId, context)
-        : checkIfRole(toType.split('.')[0], toId, ['speaker', 'vip', 'moderator', 'owner'], context)
+    const [toType, toId, toSession] = peer.split(':')
+    const hasRole = await clientHasAccessRoles(client, { objectType: toType, object: toId }, writerRoles)
+    return hasRole
   },
   async daoPath({ peer }, { client, service }, method) {
     return PeerState.path(peer)
@@ -63,12 +74,10 @@ definition.action({
   access: async ({ peer }, context) => {
     const { client, service, visibilityTest } = context
     if(visibilityTest) return true
-    const [toType, toId, toSession] = peer.split('_')
-    const publicSessionInfo = await getPublicInfo(client.sessionId)
-    if(publicSessionInfo.id != toSession) return false
-    return toType.split('.')[0] == 'priv'
-        ? checkPrivAccess(toId, context)
-        : checkIfRole(toType.split('.')[0], toId, ['speaker', 'vip', 'moderator', 'owner'], context)
+    const [toType, toId, toSession] = peer.split(':')
+    if(client.session !== toSession) return false
+    const hasRole = await clientHasAccessRoles(client, { objectType: toType, object: toId }, writerRoles)
+    return hasRole
   },
   async execute(props, { client, service }, emit) {
     let data = { }

package/turn.js

@@ -1,5 +1,5 @@
-const crypto = require('crypto')
-const ReactiveDao = require('@live-change/dao')
+import crypto from 'crypto'
+import ReactiveDao from '@live-change/dao'
 import definition from './definition.js'
 const config = definition.config
 
@@ -7,9 +7,16 @@ 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 { clientHasAccessRole } = require("../access-control-service/access.js")(definition)
+const {
+  readerRoles = ['reader', 'speaker', 'vip', 'moderator', 'owner'],
+  writerRoles = ['speaker', 'vip', 'moderator', 'owner']
+} = config
 
-const { Peer } = require('./peer.js')
+import accessControl from '@live-change/access-control-service/access.js'
+const { clientHasAccessRoles } = accessControl(definition)
+
+
+import { Peer } from './peer.js'
 
 function randomHexString(size) {
   return new Promise((resolve, reject) => {
@@ -24,11 +31,12 @@ async function createTurnConfiguration({ client }) {
   const expire = Date.now() / 1000 + turnExpireTime | 0
   const username = await randomHexString(10)
   const rusername = expire + ':' + username
+  console.log("TURN SECRET", secret, rusername)
   const password = crypto
     .createHmac('sha1', secret)
     .update(rusername)
     .digest('base64')
-  /// TODO: select nearest servers by geoip
+  /// TODO: select nearest servers by geoip and loadbalancing
   return {
     urls,
     credentialType: 'password',
@@ -51,11 +59,11 @@ definition.view({
   },
   access: async ({ peer },  { client, service, visibilityTest }) => {
     if(visibilityTest) return true
-    const [ channelType, channel, sessionType, session, instance ] = peer.split(':')
-    if(sessionType != 'session_Session') throw new Error('wrongSessionType')
-    if(session != client.session) throw new Error('wrongSession')
-    return clientHasAccessRole(client, { objectType: channelType.split('.')[0], object: channel },
-        ['speaker', 'vip', 'moderator', 'owner'])
+    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)
+    return result
   },
   observable({ peer }, context) {
     const observable = new ReactiveDao.ObservableValue()