Bump version to 9.2.2

This reverts commit 20e011bb5507948894f9500355b457aa349556e9.

config/metadata.cjs

@@ -9,8 +9,8 @@ module.exports = {
   source: pkg.repository.url,
   downloadURL: 'https://source.cp-austria.at/git/CPATRD/3cx_tapi/raw/branch/master/3CX_TAPI.user.js',
   match: [
-    'https://192.168.0.154:5001/webclient*',
-    'https://cpsolution.my3cx.at:5001/webclient*'
+    'https://192.168.0.154:5001/*',
+    'https://cpsolution.my3cx.at:5001/*'
   ],
   require: [
     'https://cdn.jsdelivr.net/gh/CoeJoder/waitForKeyElements.js@v1.2/waitForKeyElements.js',

config/webpack.config.base.cjs

@@ -15,8 +15,6 @@ const webpackConfig = {
   },
   externals: {
     jquery: '$',
-    axios: 'axios',
-    'axios-userscript-adapter': 'axiosGmxhrAdapter'
   },
   module: {
     rules: [

config/webpack.config.dev.cjs

@@ -1,7 +1,7 @@
 const path = require('path')
 const { merge } = require('webpack-merge')
 const LiveReloadPlugin = require('webpack-livereload-plugin')
-const UserScriptMetaDataPlugin = require('userscript-metadata-webpack-plugin')
+const { UserScriptMetaDataPlugin } = require('userscript-metadata-webpack-plugin')
 
 const metadata = require('./metadata.cjs')
 const webpackConfig = require('./webpack.config.base.cjs')

config/webpack.config.production.cjs

@@ -1,5 +1,5 @@
 const { merge } = require('webpack-merge')
-const UserScriptMetaDataPlugin = require('userscript-metadata-webpack-plugin')
+const { UserScriptMetaDataPlugin } = require('userscript-metadata-webpack-plugin')
 
 const metadata = require('./metadata.cjs')
 const webpackConfig = require('./webpack.config.base.cjs')

package.json

@@ -1,7 +1,7 @@
 {
   "name": "3cx-tapi",
   "description": "3CX CP Tapi and Projectmanager integration",
-  "version": "9.0.3",
+  "version": "9.2.2",
   "author": {
     "name": "Daniel Triendl",
     "email": "d.triendl@cp-solutions.at"
@@ -24,33 +24,32 @@
   },
   "private": true,
   "dependencies": {
-    "axios": "0.27.2",
-    "axios-userscript-adapter": "0.1.12",
-    "chrono-node": "^2.4.1"
+    "chrono-node": "^2.7.7",
+    "@trim21/gm-fetch": "^0.1.16"
   },
   "devDependencies": {
-    "@babel/core": "7.19.3",
-    "@babel/preset-env": "7.19.3",
-    "@typescript-eslint/eslint-plugin": "5.38.1",
-    "@typescript-eslint/parser": "5.38.1",
-    "babel-loader": "8.2.5",
-    "browserslist": "4.21.4",
-    "css-loader": "6.7.1",
-    "eslint": "8.24.0",
-    "eslint-config-standard": "17.0.0",
-    "eslint-plugin-import": "2.26.0",
+    "@types/greasemonkey": "^4.0.7",
+    "@babel/core": "^7.25.8",
+    "@babel/preset-env": "^7.25.8",
+    "@typescript-eslint/eslint-plugin": "^8.8.1",
+    "@typescript-eslint/parser": "^8.8.1",
+    "babel-loader": "^9.2.1",
+    "browserslist": "^4.21.9",
+    "css-loader": "^7.1.2",
+    "eslint": "^9.12.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-promise": "6.0.1",
-    "less": "4.1.3",
-    "less-loader": "11.0.0",
-    "style-loader": "3.3.1",
-    "ts-loader": "9.4.1",
-    "typescript": "4.8.4",
-    "userscript-metadata-webpack-plugin": "0.1.5",
-    "webpack": "5.74.0",
-    "webpack-bundle-analyzer": "4.6.1",
-    "webpack-cli": "4.10.0",
+    "eslint-plugin-promise": "^7.1.0S",
+    "less": "4.2.0",
+    "less-loader": "^12.2.0",
+    "style-loader": "^4.0.0",
+    "ts-loader": "^9.5.1",
+    "typescript": "^5.6.3",
+    "userscript-metadata-webpack-plugin": "^0.4.0",
+    "webpack": "^5.95.0",
+    "webpack-bundle-analyzer": "^4.10.2",
+    "webpack-cli": "^5.1.4",
     "webpack-livereload-plugin": "3.0.2",
-    "webpack-merge": "5.8.0"
+    "webpack-merge": "^6.0.1"
   }
 }

src/call-history.ts

@@ -1,6 +1,7 @@
 import * as chrono from 'chrono-node'
 import { TapiContact } from './tapi-contact'
-import { axios, extractNumber } from './utils'
+import { extractNumber } from './utils'
+import GM_fetch from '@trim21/gm-fetch'
 
 export class CallHistory {
   private callerIds: { [number: string]: TapiContact } = {}
@@ -22,9 +23,10 @@ export class CallHistory {
       date = dateParts.groups.date
       duration = dateParts.groups.duration
     }
-    var parsedDate = chrono.de.parseDate(date)
-    if (!parsedDate) {
-      parsedDate = chrono.parseDate(date)
+    var parsedDate = chrono.parseDate(date)
+    var parsedDateDe = chrono.de.parseDate(date)
+    if (parsedDateDe) {
+      parsedDate = parsedDateDe
     }
     if (!parsedDate) {
       return
@@ -84,10 +86,10 @@ export class CallHistory {
     if (this.callerIds[number] !== undefined) {
       this.updateCallHistoryEntry(element, this.callerIds[number])
     } else {
-      var response = await axios.get<TapiContact>('http://cpatapi.cpsrvweb2016.cp-austria.at/callerid/' + encodeURIComponent(number))
+      var response = await GM_fetch('http://cpatapi.cpsrvweb2016.cp-austria.at/callerid/' + encodeURIComponent(number))
       var callerId: TapiContact = { tD_NAME: '' }
       if (response.status === 200) {
-        callerId = response.data
+        callerId = await response.json() as TapiContact
       }
       console.log('TAPI call histroy callerid response', number, response, callerId)
       this.callerIds[number] = callerId

src/call-notification.ts

@@ -1,5 +1,6 @@
+import GM_fetch from '@trim21/gm-fetch'
 import { TapiContact } from './tapi-contact'
-import { axios, extractNumber } from './utils'
+import { extractNumber } from './utils'
 
 export class CallNotification {
   public async showCallNotification (element: HTMLElement) {
@@ -13,19 +14,19 @@ export class CallNotification {
     }
 
     console.log('TAPI searching callerid for', number)
-    var response = await axios.get<TapiContact>('http://cpatapi.cpsrvweb2016.cp-austria.at/callerid/' + encodeURIComponent(number))
+    var response = await GM_fetch('http://cpatapi.cpsrvweb2016.cp-austria.at/callerid/' + encodeURIComponent(number))
     console.log('TAPI callerid response', response)
     var notification = {
       text: number
     }
     if (response.status === 200) {
-      var callerId = response.data
+      var callerId = await response.json() as TapiContact
       if (callerId) {
         notification.text = callerId.tD_NAME + '\r\n' + number + ' (' + callerId.tD_MEDIUM + ')'
       }
     }
 
     // eslint-disable-next-line no-undef
-    GM.notification(notification)
+    GM.notification(notification.text, 'TAPI Anruf')
   }
 }

src/decs.d.ts

@@ -1,3 +0,0 @@
-declare module 'axios-userscript-adapter'
-
-declare const GM: any

src/search.css

@@ -1,9 +1,42 @@
-.tapi-search-result {
+.tapi-search-autocomplete {
+    /*the container must be positioned relative:*/
+    position: relative;
+    display: inline-block;
+    margin-right: 20px;
+  }
+.tapi-search-autocomplete input {
+    border: 1px solid transparent;
+    background-color: #f1f1f1;
+    /*padding: 10px;*/
+    /*font-size: 16px;*/
+}
+.tapi-search-autocomplete input[type=text] {
+    background-color: #f1f1f1;
+    width: 100%;
+}
+
+.tapi-search-autocomplete-items {
+    position: absolute;
+    border: 1px solid #d4d4d4;
+    border-bottom: none;
+    border-top: none;
+    z-index: 99;
+    /*position the autocomplete items to be the same width as the container:*/
+    top: 100%;
+    left: 0;
+    right: 0;
+}
+.tapi-search-autocomplete-items div {
+    padding: 10px;
+    cursor: pointer;
+    background-color: #fff;
+    border-bottom: 1px solid #d4d4d4;
     color: #000;
-    padding: 5px;
 }
-
-.tapi-search-result:hover, .tapi-search-result-selected {
-    background-color: #E7E6E6;
+.tapi-search-autocomplete-items div p {
+    margin: 0;
+}
+.tapi-search-autocomplete-items div:hover, .tapi-search-autocomplete-active {
+    /*when hovering an item:*/
+    background-color: #E7E6E6 !important;
 }
-

src/search.ts

@@ -1,7 +1,8 @@
 import './search.css'
 import { TapiContact } from './tapi-contact'
 import { debounce } from './debounce'
-import { axios, fireChangeEvents } from './utils'
+import { fireChangeEvents } from './utils'
+import GM_fetch from '@trim21/gm-fetch'
 
 export class Search {
   private currentSearchText = ''
@@ -10,13 +11,10 @@ export class Search {
     console.log('Create TAPI Search')
 
     var form = document.createElement('form')
-    form.style.width = '200px'
-    form.style.float = 'right'
-    form.style.marginRight = '20px'
     form.onsubmit = () => {
-      var items = document.getElementsByClassName('tapi-search-result-selected')
+      var items = document.getElementsByClassName('tapi-search-autocomplete-active')
       if (items.length === 0) {
-        items = document.getElementsByClassName('tapi-search-result')
+        items = document.getElementsByClassName('tapi-search-autocomplete-item')
       }
       if (items.length > 0) {
         this.dial((<HTMLElement>items[0]).dataset.tapiNumber)
@@ -28,23 +26,14 @@ export class Search {
     }
 
     var searchBox = document.createElement('div')
-    searchBox.classList.add('contact-search-box')
+    searchBox.classList.add('tapi-search-autocomplete')
+    searchBox.style.width = '200px'
     searchBox.id = 'tapiSearchBox'
     form.appendChild(searchBox)
 
-    var searchWrapper = document.createElement('div')
-    searchWrapper.classList.add('search-input-wrapper')
-    searchWrapper.style.position = 'relative'
-    searchBox.appendChild(searchWrapper)
-
     var search = document.createElement('input')
     search.id = 'tapiSearchInput'
     search.autocomplete = 'off'
-    search.classList.add('padder')
-    search.classList.add('rounded')
-    search.classList.add('bg-light')
-    search.classList.add('no-border')
-    search.classList.add('contact-search-box')
     search.placeholder = 'TAPI Suche'
     search.onfocus = () => { this.doSearch() }
     search.onkeydown = (ev) => { this.doSearchKeyDown(ev) }
@@ -53,22 +42,15 @@ export class Search {
       setTimeout(() => {
         console.log('TAPI clear search results')
         this.removeSearchResults()
-      }, 500)
+      }, 250)
     }
-    searchWrapper.appendChild(search)
-
-    var icon = document.createElement('span')
-    icon.classList.add('fa')
-    icon.classList.add('fa-search')
-    icon.classList.add('form-control-feedback')
-    icon.style.color = 'grey'
-    searchWrapper.appendChild(icon)
+    searchBox.appendChild(search)
 
     element.parentElement.insertBefore(form, element)
   }
 
   private removeSearchResults () {
-    var resultList = document.getElementById('tapiResults')
+    var resultList = document.getElementById('tapi-search-autocomplete-list')
     if (resultList) {
       resultList.parentNode.removeChild(resultList)
     }
@@ -77,12 +59,12 @@ export class Search {
 
   private doSearchKeyDown (ev: KeyboardEvent) {
     if (ev.key === 'ArrowUp') {
-      let items = document.getElementsByClassName('tapi-search-result-selected')
+      let items = document.getElementsByClassName('tapi-search-autocomplete-active')
       if (items.length > 0) {
         var prev = <Element>items[0].previousSibling
       }
       if (!prev) {
-        items = document.getElementsByClassName('tapi-search-result')
+        items = document.getElementsByClassName('tapi-search-autocomplete-item')
         if (items.length > 0) {
           prev = items[items.length - 1]
         }
@@ -92,12 +74,12 @@ export class Search {
         prev.scrollIntoView(true)
       }
     } else if (ev.key === 'ArrowDown') {
-      let items = document.getElementsByClassName('tapi-search-result-selected')
+      let items = document.getElementsByClassName('tapi-search-autocomplete-active')
       if (items.length > 0) {
         var next = <Element>items[0].nextSibling
       }
       if (!next) {
-        items = document.getElementsByClassName('tapi-search-result')
+        items = document.getElementsByClassName('tapi-search-autocomplete-item')
         if (items.length > 0) {
           next = items[0]
         }
@@ -121,52 +103,39 @@ export class Search {
       return
     }
     console.log('Searching TAPI')
-    var response = await axios.get<TapiContact[]>('http://cpatapi.cpsrvweb2016.cp-austria.at/search?query=' + encodeURIComponent(searchText))
+    var response = await GM_fetch('http://cpatapi.cpsrvweb2016.cp-austria.at/search?query=' + encodeURIComponent(searchText))
     console.log('TAPI Search response', response)
-    var contacts = response.data
+    var contacts = await response.json() as TapiContact[]
     console.log('TAPI Contacts', contacts)
     this.removeSearchResults()
     this.currentSearchText = searchText
 
-    var resultList = document.createElement('ul')
-    resultList.id = 'tapiResults'
-    resultList.classList.add('search-nav-absolute')
-    resultList.classList.add('search-nav-ul')
-    document.getElementById('tapiSearchBox').appendChild(resultList)
+    var results = document.createElement('div');
+    results.setAttribute('id', 'tapi-search-autocomplete-list')
+    results.setAttribute('class', 'tapi-search-autocomplete-items')
+    document.getElementById('tapiSearchBox').appendChild(results)
 
-    resultList.innerHTML = ''
     contacts.forEach(contact => {
-      var li = document.createElement('li')
-      li.classList.add('tapi-search-result')
-      li.classList.add('pointer')
-      li.onmouseover = () => { this.selectResult(li) }
-      li.dataset.tapiNumber = contact.tD_NUMBER_TAPI
-      li.onclick = () => { this.dial(contact.tD_NUMBER_TAPI) }
-      li.style.listStyle = 'outside none none' // display: flex; align-items: center;
-
-      var resultText = document.createElement('div')
-      resultText.classList.add('search-result-txt')
-      li.appendChild(resultText)
-
-      var line1 = document.createElement('div')
-      line1.appendChild(document.createTextNode(contact.tD_NAME))
-      resultText.appendChild(line1)
-
-      var line2 = document.createElement('div')
-      line2.appendChild(document.createTextNode(contact.tD_MEDIUM + ': ' + contact.tD_NUMBER_TAPI))
-      resultText.appendChild(line2)
-
-      resultList.appendChild(li)
+      var item = document.createElement('div');
+      item.setAttribute('class', 'tapi-search-autocomplete-item')
+      var p = document.createElement('p')
+      p.innerHTML = contact.tD_NAME + '<br>' + contact.tD_MEDIUM + ': ' + contact.tD_NUMBER_TAPI
+      item.appendChild(p)
+      item.onclick = () => { this.dial(contact.tD_NUMBER_TAPI) }
+      item.onmouseover = () => { this.selectResult(item) }
+      item.dataset.tapiNumber = contact.tD_NUMBER_TAPI
+      results.appendChild(item);
     })
   }, 200)
 
-  private selectResult (resultLi: Element) {
-    var items = document.getElementsByClassName('tapi-search-result')
-    for (var item of items) {
-      item.classList.remove('tapi-search-result-selected')
+  private selectResult (item: Element) {
+    console.log('Select item', item)
+    var items = document.getElementsByClassName('tapi-search-autocomplete-active')
+    for (var i of items) {
+      i.classList.remove('tapi-search-autocomplete-active')
     }
 
-    resultLi.classList.add('tapi-search-result-selected')
+    item.classList.add('tapi-search-autocomplete-active')
   }
 
   private dial (number: string) {

src/status.ts

@@ -1,6 +1,6 @@
 import './status.css';
-import { axios } from './utils';
 import { ZcStatus } from './zc-status';
+import GM_fetch from "@trim21/gm-fetch";
 
 declare function waitForKeyElements(selectorOrFunction: any, callback: any, waitOnce: boolean): any;
 
@@ -26,16 +26,18 @@ export class Status {
   private async checkStatus() {
     if (this._enabled) {
       try {
-        var response = await axios.get<ZcStatus>('http://cpatapi.cpsrvweb2016.cp-austria.at/availability/' + encodeURIComponent(this._user));
-
+        var response = await GM_fetch('http://cpatapi.cpsrvweb2016.cp-austria.at/availability/' + encodeURIComponent(this._user));
         if (response.status == 200) {
-          var status = response.data;
+          var status = await response.json() as ZcStatus;
           if (this._currentStatus !== status.loggedIn) {
             this._currentStatus = status.loggedIn;
             console.log('New status, loggedIn', this._currentStatus);
-            (document.getElementsByTagName("wcavatar")[0] as HTMLAnchorElement).click();
+            var accMenu = document.getElementsByTagName("wc-account-menu")[0];
+            var avatar = accMenu.getElementsByTagName("app-avatar")[0] as HTMLAnchorElement;
+            avatar.click();
             setTimeout(() => {
               var statusId = this._currentStatus ? this._statusOn : this._statusOff;
+              console.log('Clicking status', statusId);
               (document.getElementById(statusId) as HTMLSpanElement).click();
             }, 1000);
           }
@@ -70,7 +72,7 @@ export class Status {
     '<div role="document" class="modal-dialog">' +
     '  <div class="modal-content">' +
     '    <div class="modal-header">' +
-    '      <h4 class="modal-title float-left">ZeitConsens Status</h4><button id="zc-btnClose" type="button" aria-label="Close" class="close float-right"><span aria-hidden="true">×</span></button>' +
+    '      <h4 class="modal-title">ZeitConsens Status</h4><button id="zc-btnClose" type="button" aria-label="Close" class="btn-close"  data-qa="modal-cross"></button>' +
     '    </div>' +
     '    <div class="modal-body">' +
     '      <div class="form-group">' +
@@ -96,13 +98,13 @@ export class Status {
     '        <label class="i-checks" for="tapi-zc-enabled">' +
     '          <input type="checkbox" id="tapi-zc-enabled">' +
     '          <i></i><span>Enabled</span>' +
-    '      </label>'
-    '      </div>';
-    '    </div>' +
-    '    <div class="modal-footer">' +
-    '      <button id="zc-btnOk" type="button" class="btn btn-primary">OK </button>' +
-    '      <button id="zc-btnCancel" type="button" class="btn btn-light">Cancel </button>' +
+    '      </label>' +
+    '      </div>' +
     '    </div>' +
+    //'    <div class="modal-footer">' +
+    //'      <button id="zc-btnOk" type="button" class="btn btn-primary" data-qa="modal-ok">OK </button>' +
+    //'      <button id="zc-btnCancel" type="button" class="btn btn-border" data-qa="modal-close">Cancel </button>' +
+    //'    </div>' +
     '  </div>' +
     '</div>';
     var modal = document.createElement('modal-container');
@@ -110,7 +112,7 @@ export class Status {
     modal.classList.add('modal');
     modal.classList.add('fade');
     modal.innerHTML = html;
-    var body = document.getElementsByTagName('body')[0].appendChild(modal);
+    document.getElementsByTagName('body')[0].appendChild(modal);
 
     var btnClose = document.getElementById('zc-btnClose');
     btnClose.onclick = () => {

src/utils.ts

@@ -1,23 +1,3 @@
-/**
- * @typedef {Object} AxiosResponse
- * @property {Object} data
- * @property {Object} headers
- * @property {Object} config
- * @property {Object} request
- * @property {number} code
- * @property {string} statusText
- */
-/**
- * @typedef {Object} AxiosError
- * @property {AxiosResponse} response
- */
-import axios from 'axios'
-import adapter from 'axios-userscript-adapter'
-
-axios.defaults.adapter = adapter
-
-export { axios }
-
 export function extractNumber (s: string) {
   var match = /(\+?[0-9]{4,})/.exec(s)
   if (!match) {

tsconfig.json

@@ -2,8 +2,8 @@
   "compilerOptions": {
     "outDir": "./dist/",
     "noImplicitAny": true,
-    "module": "es6",
-    "target": "es6",
+    "module": "ESNext",
+    "target": "ES2022",
     "allowJs": true,
     "moduleResolution": "node"
   }