Merge branch 'develop'

README.md

@@ -22,9 +22,11 @@ npm start
 
 ## Supported features
 * Screen casting
-* Touch events
+* Touch events (including multi-touch)
 * Input events
-* Video setting changing
+* Clipboard events
+* Device "rotation"
+* Video settings changing
 
 ## Known issues
 
@@ -37,9 +39,12 @@ npm start
 * [131/h264-live-player](https://github.com/131/h264-live-player)
 * [oneam/h264bsd](https://github.com/oneam/h264bsd)
 * [mbebenita/Broadway](https://github.com/mbebenita/Broadway)
+* [openstf/adbkit](https://github.com/openstf/adbkit)
+* [openstf/adbkit-logcat](https://github.com/openstf/adbkit-logcat)
+* [xtermjs/xterm.js](https://github.com/xtermjs/xterm.js)
 
 ## scrcpy websocket fork
 
-Currently support of WebSocket protocol added to v1.9 of scrcpy
-* [Prebuilt package](https://github.com/NetrisTV/scrcpy/releases/download/v1.9-ws/scrcpy-server.jar)
-* [Source code](https://github.com/NetrisTV/scrcpy/tree/feature/websocket-v1.9)
+Currently support of WebSocket protocol added to v1.13 of scrcpy
+* [Prebuilt package](https://github.com/NetrisTV/scrcpy/releases/download/v1.13-ws/scrcpy-server.jar)
+* [Source code](https://github.com/NetrisTV/scrcpy/tree/feature/websocket-v1.13)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ws-scrcpy",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "ws client for scrcpy",
   "scripts": {
     "build": "npm run compile && npm run copy:vendor && npx browserify build/index.js -o build/bundle.js",
@@ -12,35 +12,40 @@
     "copy:public": "node -e \"require('recursive-copy')('src/public','dist/public', {overwrite: true, debug: true} ,function(e){if(e)process.exit(1);process.exit(0);})\"",
     "copy:server": "node -e \"require('recursive-copy')('build/server','dist/server', {overwrite: true, debug: true} ,function(e){if(e)process.exit(1);process.exit(0);})\"",
     "copy:vendor": "node -e \"require('recursive-copy')('src/vendor','build', {overwrite: true, debug: true} ,function(e){if(e)process.exit(1);process.exit(0);})\"",
-    "dist": "npm run build && npm run download && npm run copy:package.json && npm run copy:public && npm run copy:bundle && npm run copy:server",
-    "download": "npm run mkdirs && cd dist/public && node -e \"fs.existsSync('scrcpy-server.jar')||require('node-wget')('https://github.com/NetrisTV/scrcpy/releases/download/v1.9-ws/scrcpy-server.jar')\"",
+    "copy:xterm.css": "node -e \"require('recursive-copy')('node_modules/xterm/css','dist/public', {overwrite: true, debug: true} ,function(e){if(e)process.exit(1);process.exit(0);})\"",
+    "dist": "npm run build && npm run mkdirs && npm run copy:package.json && npm run copy:public && npm run copy:xterm.css && npm run copy:bundle && npm run copy:server",
     "copy:package.json": "node -e \"const j=require('./package.json');const {name,version,description,author,license,dependencies,scripts}=j; const p={name, version, description,author,license,dependencies}; p.scripts={start: scripts['dist:start']};fs.writeFileSync('./dist/package.json', JSON.stringify(p, null, '  '))\"",
     "mkdirs": "npx mkdirp dist/public",
     "start": "npm run dist && npm run start:dist",
     "start:dist": "cd dist && npm start",
-    "dist:start": "cd public && npx ws --websocket ../server/websocket.js --spa index.html",
+    "dist:start": "cd server && node index.js",
+    "lint": "npx tslint --project .",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Sergey Volkov <[email protected]>",
   "license": "MIT",
   "dependencies": {
-    "appium-adb": "^7.7.1",
-    "local-web-server": "^2.6.1"
+    "adbkit": "^2.11.1",
+    "adbkit-logcat": "^2.0.1",
+    "node-pty": "^0.9.0",
+    "tslib": "^1.9.3",
+    "ws": "^7.2.3"
   },
   "devDependencies": {
     "@types/node": "^12.0.2",
-    "@types/ws": "^6.0.1",
+    "@types/ws": "^6.0.4",
     "browserify": "^16.2.3",
     "buffer": "^5.2.1",
     "h264-converter": "^0.1.0",
     "mkdirp": "^0.5.1",
-    "node-wget": "^0.4.3",
     "recursive-copy": "^2.0.10",
     "rimraf": "^3.0.0",
     "sylvester.js": "^0.1.1",
-    "tslib": "^1.9.3",
     "tslint": "^5.16.0",
     "tslint-react": "^4.0.0",
-    "typescript": "^3.4.5"
+    "typescript": "^3.4.5",
+    "xterm": "^4.5.0",
+    "xterm-addon-attach": "^0.5.0",
+    "xterm-addon-fit": "^0.3.0"
   }
 }