@live-change/video-call-frontend 0.8.46 → 0.8.48

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/front/src/room/PeerVideo.vue +9 -5
  2. package/front/src/room/Room.vue +13 -1
  3. package/front/src/room/VideoWall.vue +2 -2
  4. package/front/src/router.js +1 -1
  5. package/package.json +38 -38
  6. package/server/init.js +12 -0
package/front/src/room/PeerVideo.vue CHANGED
@@ -9,9 +9,11 @@
9
9
  }">
10
10
  </div>
11
11
 
12
- <div v-if="(peerState?.videoMuted || !stream) && !image"
12
+ <div v-if="(peerState?.videoState !== 'enabled' || !stream) && !image"
13
13
  class="absolute w-full h-full flex flex-column align-items-center justify-content-center identification">
14
14
  <UserIdentification :ownerType="ownerType" :owner="owner" />
15
+ <!-- <pre>{{ peerState }}</pre>
16
+ <pre>[{{ ownerType }}]</pre>-->
15
17
  </div>
16
18
 
17
19
  <div v-if="stream">
@@ -26,8 +28,8 @@
26
28
  </video>
27
29
  </div>
28
30
 
29
- <div class="absolute top-0 right-0 h-3rem pr-1
30
- flex align-items-center">
31
+ <div v-if="peerState"
32
+ class="absolute top-0 right-0 h-3rem pr-1 flex align-items-center">
31
33
  <div v-if="peerState.audioState === 'muted'"
32
34
  class="border-circle bg-black-alpha-40 mx-1
33
35
  flex align-items-center justify-content-center w-2rem h-2rem">
@@ -65,6 +67,9 @@
65
67
  .peer-video {
66
68
  .identification {
67
69
  & > span > span, a {
70
+ &:hover {
71
+ background: none !important;
72
+ }
68
73
  display: flex !important;
69
74
  flex-direction: column !important;
70
75
  position: absolute;
@@ -77,11 +82,10 @@
77
82
  height: 100%;
78
83
  width: 100%;
79
84
  img, i {
80
- max-height: 70px !important;
85
+ max-height: 120px !important;
81
86
  width: auto !important;
82
87
  height: 50% !important;
83
88
  aspect-ratio: 1/1;
84
- border: 1px solid red;
85
89
  }
86
90
  span {
87
91
  color: rgba(255,255,255,0.8);
package/front/src/room/Room.vue CHANGED
@@ -24,10 +24,12 @@
24
24
  class="w-full h-full top-0 absolute surface-900"
25
25
  />
26
26
  <div class="absolute bottom-0 h-4rem left-50 right-50 flex flex-row justify-content-center">
27
- <div class="absolute w-8rem h-full bg-black-alpha-70 flex flex-row align-items-center
27
+ <div class="absolute w-11rem h-full bg-black-alpha-70 flex flex-row align-items-center
28
28
  justify-content-between px-3">
29
29
  <MicrophoneButton v-model="selectedDevices" />
30
30
  <CameraButton v-model="selectedDevices" />
31
+ <Button @click="leave" raised
32
+ icon="bx bx-exit" severity="warning" rounded v-ripple />
31
33
  </div>
32
34
  </div>
33
35
  </template>
@@ -85,6 +87,10 @@
85
87
  state.value = 'joined'
86
88
  }
87
89
 
90
+ function leave() {
91
+ state.value = 'welcome'
92
+ }
93
+
88
94
  const localMediaStreams = computed(() =>
89
95
  ( selectedDevices.value?.media ? [selectedDevices.value.media] : [])
90
96
  .concat(displayMedia.value ? [displayMedia.value] : [])
@@ -145,17 +151,23 @@
145
151
  const otherPeer = peer.value.otherPeers.find(peer => peer.id === peerId)
146
152
  for(const remoteTrack of unref(connection.remoteTracks)) {
147
153
  if(output.find(remoteStream => remoteStream.stream === remoteTrack.stream)) continue
154
+ const [ownerType, owner] = otherPeer.user
155
+ ? ['user_User', otherPeer.user?.user]
156
+ : ['session_Session', otherPeer.session]
148
157
  output.push({
149
158
  id: remoteTrack.stream.id,
150
159
  from: connection.to,
151
160
  stream: remoteTrack.stream,
152
161
  peerState: otherPeer?.peerState,
162
+ ownerType, owner
153
163
  })
154
164
  }
155
165
  }
156
166
  return output
157
167
  })
158
168
 
169
+ globalThis.peer = peer
170
+
159
171
 
160
172
  </script>
161
173
 
package/front/src/room/VideoWall.vue CHANGED
@@ -17,8 +17,8 @@
17
17
  :id="tile.id" :image="tile.video?.image"
18
18
  :mirror="tile.video?.mirror"
19
19
  :peer-state="tile.video?.peerState"
20
- :ownerType="tile.ownerType ?? 'unknown'"
21
- :owner="tile.owner ?? 'unknown'"
20
+ :ownerType="tile.video?.ownerType ?? 'unknown'"
21
+ :owner="tile.video?.owner ?? 'unknown'"
22
22
  @resize="ev => handleVideoResize(tile, ev)"
23
23
  @click="ev => handleVideoClick(tile, ev)"
24
24
  :style="videoStyles[tile.id]">
package/front/src/router.js CHANGED
@@ -16,7 +16,7 @@ export function videoCallRoutes(config = {}) {
16
16
  const { prefix = '/', route = (r) => r } = config
17
17
  return [
18
18
  route({
19
- name: 'video-call:room', path: prefix+ '/room/:room', meta: { }, props:true,
19
+ name: 'video-call:room', path: prefix+ '/room/:room', meta: { raw: true }, props:true,
20
20
  component: () => import("./room/Room.vue"),
21
21
  }),
22
22
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@live-change/video-call-frontend",
3
- "version": "0.8.46",
3
+ "version": "0.8.48",
4
4
  "scripts": {
5
5
  "memDev": "node server/start.js memDev --enableSessions --initScript ./init.js --dbAccess",
6
6
  "localDevInit": "rm tmp.db; node server/start.js localDev --enableSessions --initScript ./init.js",
@@ -35,41 +35,41 @@
35
35
  "@codemirror/language": "6.10.1",
36
36
  "@dotenvx/dotenvx": "0.27.0",
37
37
  "@fortawesome/fontawesome-free": "^6.5.2",
38
- "@live-change/access-control-frontend": "^0.8.46",
39
- "@live-change/access-control-service": "^0.8.46",
40
- "@live-change/backup-service": "^0.8.46",
41
- "@live-change/blog-frontend": "^0.8.46",
42
- "@live-change/blog-service": "^0.8.46",
43
- "@live-change/cli": "^0.8.46",
44
- "@live-change/content-frontend": "^0.8.46",
45
- "@live-change/content-service": "^0.8.46",
46
- "@live-change/dao": "^0.8.46",
47
- "@live-change/dao-vue3": "^0.8.46",
48
- "@live-change/dao-websocket": "^0.8.46",
49
- "@live-change/db-client": "^0.8.46",
50
- "@live-change/email-service": "^0.8.46",
51
- "@live-change/framework": "^0.8.46",
52
- "@live-change/frontend-auto-form": "^0.8.46",
53
- "@live-change/frontend-base": "^0.8.46",
54
- "@live-change/geoip-service": "^0.8.46",
55
- "@live-change/image-frontend": "^0.8.46",
56
- "@live-change/locale-settings-service": "^0.8.46",
57
- "@live-change/password-authentication-service": "^0.8.46",
58
- "@live-change/peer-connection-service": "^0.8.46",
59
- "@live-change/prosemirror-service": "^0.8.46",
60
- "@live-change/secret-code-service": "^0.8.46",
61
- "@live-change/secret-link-service": "^0.8.46",
62
- "@live-change/session-service": "^0.8.46",
63
- "@live-change/task-service": "^0.8.46",
64
- "@live-change/upload-frontend": "^0.8.46",
65
- "@live-change/url-frontend": "^0.8.46",
66
- "@live-change/url-service": "^0.8.46",
67
- "@live-change/user-frontend": "^0.8.46",
68
- "@live-change/user-identification-service": "^0.8.46",
69
- "@live-change/user-service": "^0.8.46",
70
- "@live-change/vote-service": "^0.8.46",
71
- "@live-change/vue3-components": "^0.8.46",
72
- "@live-change/vue3-ssr": "^0.8.46",
38
+ "@live-change/access-control-frontend": "^0.8.48",
39
+ "@live-change/access-control-service": "^0.8.48",
40
+ "@live-change/backup-service": "^0.8.48",
41
+ "@live-change/blog-frontend": "^0.8.48",
42
+ "@live-change/blog-service": "^0.8.48",
43
+ "@live-change/cli": "^0.8.48",
44
+ "@live-change/content-frontend": "^0.8.48",
45
+ "@live-change/content-service": "^0.8.48",
46
+ "@live-change/dao": "^0.8.48",
47
+ "@live-change/dao-vue3": "^0.8.48",
48
+ "@live-change/dao-websocket": "^0.8.48",
49
+ "@live-change/db-client": "^0.8.48",
50
+ "@live-change/email-service": "^0.8.48",
51
+ "@live-change/framework": "^0.8.48",
52
+ "@live-change/frontend-auto-form": "^0.8.48",
53
+ "@live-change/frontend-base": "^0.8.48",
54
+ "@live-change/geoip-service": "^0.8.48",
55
+ "@live-change/image-frontend": "^0.8.48",
56
+ "@live-change/locale-settings-service": "^0.8.48",
57
+ "@live-change/password-authentication-service": "^0.8.48",
58
+ "@live-change/peer-connection-service": "^0.8.48",
59
+ "@live-change/prosemirror-service": "^0.8.48",
60
+ "@live-change/secret-code-service": "^0.8.48",
61
+ "@live-change/secret-link-service": "^0.8.48",
62
+ "@live-change/session-service": "^0.8.48",
63
+ "@live-change/task-service": "^0.8.48",
64
+ "@live-change/upload-frontend": "^0.8.48",
65
+ "@live-change/url-frontend": "^0.8.48",
66
+ "@live-change/url-service": "^0.8.48",
67
+ "@live-change/user-frontend": "^0.8.48",
68
+ "@live-change/user-identification-service": "^0.8.48",
69
+ "@live-change/user-service": "^0.8.48",
70
+ "@live-change/vote-service": "^0.8.48",
71
+ "@live-change/vue3-components": "^0.8.48",
72
+ "@live-change/vue3-ssr": "^0.8.48",
73
73
  "@vueuse/core": "^10.11.0",
74
74
  "boxicons": "^2.1.4",
75
75
  "codeceptjs-assert": "^0.0.5",
@@ -93,7 +93,7 @@
93
93
  "vue3-scroll-border": "0.1.6"
94
94
  },
95
95
  "devDependencies": {
96
- "@live-change/codeceptjs-helper": "^0.8.46",
96
+ "@live-change/codeceptjs-helper": "^0.8.48",
97
97
  "codeceptjs": "^3.5.12",
98
98
  "generate-password": "1.7.1",
99
99
  "playwright": "^1.41.2",
@@ -104,5 +104,5 @@
104
104
  "author": "Michał Łaszczewski <michal@laszczewski.pl>",
105
105
  "license": "ISC",
106
106
  "description": "",
107
- "gitHead": "a86f309b65b5d5c37d31ddb6b8ef0f53d1f6abaa"
107
+ "gitHead": "9ae6d66584698d617185f131b18a888545e2164d"
108
108
  }
package/server/init.js CHANGED
@@ -20,4 +20,16 @@ export default async function(services) {
20
20
  sessionRoles: ['speaker']
21
21
  })
22
22
 
23
+
24
+ const user = '[testUser]'
25
+ const email = 'tester@test.com'
26
+ const email2 = 'tester2@test.com'
27
+ const password = 'Testy123'
28
+ const passwordHash = services.passwordAuthentication.models.PasswordAuthentication
29
+ .definition.properties.passwordHash.preFilter(password)
30
+ await services.user.models.User.create({ id: user, roles: [] })
31
+ await services.passwordAuthentication.models.PasswordAuthentication.create({ id: user, user, passwordHash })
32
+ await services.email.models.Email.create({ id: email, email, user })
33
+ await services.email.models.Email.create({ id: email2, email: email2, user })
34
+
23
35
  }