From 2cad36168c019607714260f47e0f1b508a7fb272 Mon Sep 17 00:00:00 2001 From: ShiKhu Date: Mon, 29 Nov 2021 11:51:02 +0100 Subject: [PATCH] feat(tracker-assist): 3.4.8: webpack 5 fully specified imports --- tracker/tracker-assist/package-lock.json | 14 ++++++------- tracker/tracker-assist/package.json | 8 ++++---- tracker/tracker-assist/src/CallWindow.ts | 10 +++++----- tracker/tracker-assist/src/index.ts | 25 ++++++++++++------------ tracker/tracker-assist/tsconfig.json | 2 +- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/tracker/tracker-assist/package-lock.json b/tracker/tracker-assist/package-lock.json index e1e86f4bf..6a78905a8 100644 --- a/tracker/tracker-assist/package-lock.json +++ b/tracker/tracker-assist/package-lock.json @@ -1,6 +1,6 @@ { "name": "@openreplay/tracker-assist", - "version": "3.4.6", + "version": "3.4.7", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -57,9 +57,9 @@ } }, "@openreplay/tracker": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/@openreplay/tracker/-/tracker-3.4.7.tgz", - "integrity": "sha512-E9ZwjPwo9WbThV9nAQbK8EKLwJcLBgQG51ND3LB+p21xaz0WcMETIaJDFFmHhhwvkCQ1Vi43gK3cjoOoHF4XFg==", + "version": "3.4.8", + "resolved": "https://registry.npmjs.org/@openreplay/tracker/-/tracker-3.4.8.tgz", + "integrity": "sha512-Qrvoa0MUzVHCfU3tl8c9e4pz5Ee59Z5TZWV4cR5f5yFMZtxUNsv5b5Q0B2DebYI/dDI1iKBscluvmQOrIaIAzw==", "dev": true, "requires": { "error-stack-parser": "^2.0.6" @@ -811,9 +811,9 @@ } }, "typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "4.6.0-dev.20211126", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.0-dev.20211126.tgz", + "integrity": "sha512-m+LKstqVv6FYW363aIbO6bm8awsLbeSUCzU6FxPtzUF/WJkFieQfYmdVwEIzigeTpw4E2GETBXnk6P6AixcQJQ==", "dev": true }, "validate-npm-package-license": { diff --git a/tracker/tracker-assist/package.json b/tracker/tracker-assist/package.json index 6f7bb536b..c4329c464 100644 --- a/tracker/tracker-assist/package.json +++ b/tracker/tracker-assist/package.json @@ -1,7 +1,7 @@ { "name": "@openreplay/tracker-assist", "description": "Tracker plugin for screen assistance through the WebRTC", - "version": "3.4.7", + "version": "3.4.8", "keywords": [ "WebRTC", "assistance", @@ -24,12 +24,12 @@ "peerjs": "^1.3.2" }, "peerDependencies": { - "@openreplay/tracker": "^3.4.3" + "@openreplay/tracker": "^3.4.8" }, "devDependencies": { - "@openreplay/tracker": "^3.4.3", + "@openreplay/tracker": "^3.4.8", "prettier": "^1.18.2", "replace-in-files-cli": "^1.0.0", - "typescript": "^3.6.4" + "typescript": "^4.6.0-dev.20211126" } } diff --git a/tracker/tracker-assist/src/CallWindow.ts b/tracker/tracker-assist/src/CallWindow.ts index 3356449ce..909c35d09 100644 --- a/tracker/tracker-assist/src/CallWindow.ts +++ b/tracker/tracker-assist/src/CallWindow.ts @@ -1,4 +1,4 @@ -import type { LocalStream } from './LocalStream'; +import type { LocalStream } from './LocalStream.js'; const SS_START_TS_KEY = "__openreplay_assist_call_start_ts" @@ -149,14 +149,14 @@ export default class CallWindow { // Hack to determine if the remote video is enabled if (this.checkRemoteVideoInterval) { clearInterval(this.checkRemoteVideoInterval) } // just in case - let enable = false + let enabled = false this.checkRemoteVideoInterval = setInterval(() => { const settings = rStream.getVideoTracks()[0]?.getSettings() //console.log(settings) const isDummyVideoTrack = !!settings && (settings.width === 2 || settings.frameRate === 0) - const shouldEnable = !isDummyVideoTrack - if (enable !== shouldEnable) { - this.toggleRemoteVideoUI(enable=shouldEnable) + const shouldBeEnabled = !isDummyVideoTrack + if (enabled !== shouldBeEnabled) { + this.toggleRemoteVideoUI(enabled=shouldBeEnabled) } }, 1000) }) diff --git a/tracker/tracker-assist/src/index.ts b/tracker/tracker-assist/src/index.ts index d36faeb95..247fd407e 100644 --- a/tracker/tracker-assist/src/index.ts +++ b/tracker/tracker-assist/src/index.ts @@ -1,20 +1,20 @@ -import './_slim'; -import Peer, { MediaConnection } from 'peerjs'; +import './_slim.js'; +import Peer from 'peerjs'; import type { DataConnection } from 'peerjs'; import { App, Messages } from '@openreplay/tracker'; import type Message from '@openreplay/tracker'; -import BufferingConnection from './BufferingConnection'; -import Mouse from './Mouse'; -import CallWindow from './CallWindow'; -import ConfirmWindow from './ConfirmWindow'; -import RequestLocalStream from './LocalStream'; +import BufferingConnection from './BufferingConnection.js'; +import Mouse from './Mouse.js'; +import CallWindow from './CallWindow.js'; +import ConfirmWindow from './ConfirmWindow.js'; +import RequestLocalStream from './LocalStream.js'; export interface Options { confirmText: string, confirmStyle: Object, // Styles object session_calling_peer_key: string, - config: Object + config: RTCConfiguration, } enum CallingState { @@ -23,7 +23,7 @@ enum CallingState { False, }; -//@ts-ignore webpack5 hack (?!) +//@ts-ignore peerjs hack for webpack5 (?!) Peer = Peer.default || Peer; // type IncomeMessages = @@ -35,7 +35,7 @@ Peer = Peer.default || Peer; export default function(opts: Partial = {}) { const options: Options = Object.assign( { - confirmText: "You have a call. Do you want to answer?", + confirmText: "You have an incoming call. Do you want to answer?", confirmStyle: {}, session_calling_peer_key: "__openreplay_calling_peer", config: null @@ -198,18 +198,19 @@ export default function(opts: Partial = {}) { dataConn.on('data', (data: any) => { if (!data) { return } if (data === "call_end") { - //console.log('receiving callend on call') + log('"call_end" received') onCallEnd(); return; } if (data.name === 'string') { - //console.log("name",data) + log("name recieved: ", data) callUI.setAssistentName(data.name); } if (data.type === "click" && typeof data.x === 'number' && typeof data.y === 'number') { const el = document.elementFromPoint(data.x, data.y) if (el instanceof HTMLElement) { el.click() + el.focus() } return } diff --git a/tracker/tracker-assist/tsconfig.json b/tracker/tracker-assist/tsconfig.json index bb8f6a4c4..95d4f9408 100644 --- a/tracker/tracker-assist/tsconfig.json +++ b/tracker/tracker-assist/tsconfig.json @@ -5,7 +5,7 @@ "alwaysStrict": true, "target": "es6", "module": "es6", - "moduleResolution": "node", + "moduleResolution": "nodenext", "allowSyntheticDefaultImports": true, "declaration": true, "outDir": "./lib"