@live-change/peer-connection-service 0.9.203 → 0.9.204

package/decodePeerId.js

@@ -0,0 +1,17 @@
+/**
+ * Peer id format: channelType:channel:peerSession:instance
+ * The channel segment may contain ':' — only the first segment is channelType and
+ * the last two are peerSession and instance; everything between is the channel.
+ */
+export function decodePeerId(peer) {
+  const parts = peer.split(':')
+  if (parts.length < 4) {
+    throw new Error(`invalid peer id: expected at least 4 colon-separated segments, got ${parts.length}`)
+  }
+  return {
+    channelType: parts[0],
+    channel: parts.slice(1, -2).join(':'),
+    peerSession: parts[parts.length - 2],
+    instance: parts[parts.length - 1]
+  }
+}

package/index.js

@@ -8,4 +8,5 @@ import './peer.js'
 import './peerState.js'
 import './message.js'
 
+export { decodePeerId } from './decodePeerId.js'
 export default definition

package/message.js

@@ -5,6 +5,7 @@ import accessControl from '@live-change/access-control-service/access.js'
 const { clientHasAccessRoles } = accessControl(definition)
 
 import { Peer } from './peer.js'
+import { decodePeerId } from './decodePeerId.js'
 
 const messageFields = {
   to: {
@@ -91,8 +92,9 @@ definition.view({
   access: async({ peer }, { client, service, visibilityTest }) => {
     if(visibilityTest) return true
     if(!peer) throw new Error("peer parameter is required")
-    console.log('MESSAGES ACCESS', peer.split(':'), "[2] == ", client.session)
-    return peer.split(':')[2] === client.session
+    const { peerSession } = decodePeerId(peer)
+    console.log('MESSAGES ACCESS', { peerSession, clientSession: client.session })
+    return peerSession === client.session
   },
   async daoPath({ peer, gt, lt, gte, lte, limit, reverse }, { client, service }, method) {
     const channelId = peer
@@ -162,12 +164,12 @@ 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(':')
-    //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 }, config.writerRoles)
+    const fromDecoded = decodePeerId(from)
+    const toDecoded = decodePeerId(to)
+    //console.log("POST MESSAGE", fromDecoded, '=>', toDecoded, "BY", client)
+    if(toDecoded.channelType !== fromDecoded.channelType || toDecoded.channel !== fromDecoded.channel) return false // different channel
+    if(client.session !== fromDecoded.peerSession) return false
+    const hasRole = await clientHasAccessRoles(client, { objectType: toDecoded.channelType, object: toDecoded.channel }, config.writerRoles)
     return hasRole
   },
   queuedBy: (props) => props.from+':'+props.to, // without this, messages order can be changed
@@ -203,12 +205,12 @@ 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(':')
-   // 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 }, config.writerRoles)
+    const fromDecoded = decodePeerId(from)
+    const toDecoded = decodePeerId(to)
+   // console.log("POST MESSAGE", fromDecoded, '=>', toDecoded, "BY", client)
+    if(toDecoded.channelType !== fromDecoded.channelType || toDecoded.channel !== fromDecoded.channel) return false // different channel
+    if(client.session !== fromDecoded.peerSession) return false
+    const hasRole = await clientHasAccessRoles(client, { objectType: toDecoded.channelType, object: toDecoded.channel }, config.writerRoles)
     return hasRole
   },
   queuedBy: (props) => props.from+':'+props.to, // without this, messages order can be changed

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@live-change/peer-connection-service",
-  "version": "0.9.203",
+  "version": "0.9.204",
   "description": "",
   "main": "index.js",
   "type": "module",
   "scripts": {
     "start": "node index.js",
     "setup": "INSTALL=true node index.js",
-    "test": "NODE_ENV=test blue-tape tests/*"
+    "test": "node --test tests/"
   },
   "author": "Michał Łaszczewski <michal@emikse.com>",
   "license": "BSD-3-Clause",
-  "gitHead": "4d4ce413fe747da2c398eb4ad378e37cc81874b3"
+  "gitHead": "6ac17ccf3c184ca4d7ef920f63827dbfd8749f96"
 }

package/peer.js

@@ -3,6 +3,7 @@ const app = App.app()
 
 import definition from './definition.js'
 import config from './config.js'
+import { decodePeerId } from './decodePeerId.js'
 
 import accessControl from '@live-change/access-control-service/access.js'
 const { clientHasAccessRoles } = accessControl(definition)
@@ -40,8 +41,8 @@ definition.view({
     //console.log("CHECK PEERS ACCESS", params, client, visibilityTest)
     return clientHasAccessRoles(client, { objectType: channelType, object: channel }, config.readerRoles)
   },
-  async daoPath({ channelType, channel }, { client, service }, method) {
-    return Peer.indexRangePath('byChannel', [ channelType, channel.split(':')[0] ])
+  async daoPath({ channelType, channel }, { client, service }, method) {    
+    return Peer.indexRangePath('byChannel', [ channelType, channel ])    
   }
 })
 
@@ -80,7 +81,7 @@ definition.trigger({
   },
   async execute({ session, peer }, context, emit) {
     console.log("PEER ONLINE PARAMS", { session, peer })
-    const [ channelType, channel, peerSession, instance ] = peer.split(':')
+    const { channelType, channel, peerSession, instance } = decodePeerId(peer)
     if(peerSession !== session) throw new Error('wrongSession')
     /// TODO: check channel access
     emit({
@@ -96,7 +97,7 @@ definition.trigger({
   },
   async execute({ session, peer }, context, emit) {
     console.log("PEER OFFLINE PARAMS", { session, peer })
-    const [ channelType, channel, peerSession, instance ] = peer.split(':')
+    const { channelType, channel, peerSession, instance } = decodePeerId(peer)
     if(peerSession !== session) throw new Error('wrongSession')
     emit({
       type: 'peerOffline',

package/peerState.js

@@ -5,6 +5,7 @@ import accessControl from '@live-change/access-control-service/access.js'
 const { clientHasAccessRoles } = accessControl(definition)
 
 import { Peer } from './peer.js'
+import { decodePeerId } from './decodePeerId.js'
 
 
 const peerStateFields = {
@@ -55,7 +56,7 @@ definition.action({
   access: async ({ peer }, context) => {
     const { client, service, visibilityTest } = context
     if(visibilityTest) return true
-    const [toType, toId, toSession] = peer.split(':')
+    const { channelType: toType, channel: toId, peerSession: toSession } = decodePeerId(peer)
     if(client.session !== toSession) return false
     const hasRole = await clientHasAccessRoles(client, { objectType: toType, object: toId }, config.writerRoles)
     return hasRole

package/tests/decodePeerId.test.js

@@ -0,0 +1,23 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { decodePeerId } from '../decodePeerId.js'
+
+test('decodePeerId: four segments, channel without colon', () => {
+  const r = decodePeerId('room_Room:chanId:sessA:inst1')
+  assert.equal(r.channelType, 'room_Room')
+  assert.equal(r.channel, 'chanId')
+  assert.equal(r.peerSession, 'sessA')
+  assert.equal(r.instance, 'inst1')
+})
+
+test('decodePeerId: channel contains colons', () => {
+  const r = decodePeerId('t:a:b:c:d:e:f')
+  assert.equal(r.channelType, 't')
+  assert.equal(r.channel, 'a:b:c:d')
+  assert.equal(r.peerSession, 'e')
+  assert.equal(r.instance, 'f')
+})
+
+test('decodePeerId: rejects fewer than four segments', () => {
+  assert.throws(() => decodePeerId('a:b:c'), /invalid peer id/)
+})

package/turn.js

@@ -12,6 +12,7 @@ const { clientHasAccessRoles } = accessControl(definition)
 
 
 import { Peer } from './peer.js'
+import { decodePeerId } from './decodePeerId.js'
 
 function randomHexString(size) {
   return new Promise((resolve, reject) => {
@@ -57,8 +58,8 @@ definition.view({
   },
   access: async ({ peer },  { client, service, visibilityTest }) => {
     if(visibilityTest) return true
-    const [ channelType, channel, session, instance ] = peer.split(':')
-    if(session !== client.session) throw new Error('wrongSession')
+    const { channelType, channel, peerSession } = decodePeerId(peer)
+    if(peerSession !== client.session) throw new Error('wrongSession')
     const result = await clientHasAccessRoles(client, { objectType: channelType.split('.')[0], object: channel },
         config.writerRoles)
     return result