diff --git a/ElectronNET.Host/api/desktopCapturer.js b/ElectronNET.Host/api/desktopCapturer.js index e0b40fd..fb2fbbb 100644 --- a/ElectronNET.Host/api/desktopCapturer.js +++ b/ElectronNET.Host/api/desktopCapturer.js @@ -1,11 +1,21 @@ "use strict"; const electron_1 = require("electron"); let electronSocket; +; module.exports = (socket) => { electronSocket = socket; socket.on('desktop-capturer-get-sources', (options) => { electron_1.desktopCapturer.getSources(options).then(sources => { - electronSocket.emit('desktop-capturer-get-sources-result', sources); + const result = sources.map(src => { + return { + appIcon: src.appIcon, + name: src.name, + id: src.id, + display_id: src.display_id, + thumbnail: { 1: src.thumbnail.toPNG().toString('base64') } + }; + }); + electronSocket.emit('desktop-capturer-get-sources-result', result); }); }); }; diff --git a/ElectronNET.Host/api/desktopCapturer.js.map b/ElectronNET.Host/api/desktopCapturer.js.map index 30315dc..9be8fa7 100644 --- a/ElectronNET.Host/api/desktopCapturer.js.map +++ b/ElectronNET.Host/api/desktopCapturer.js.map @@ -1 +1 @@ -{"version":3,"file":"desktopCapturer.js","sourceRoot":"","sources":["desktopCapturer.ts"],"names":[],"mappings":";AACA,uCAA2C;AAE3C,IAAI,cAAc,CAAC;AAEnB,iBAAS,CAAC,MAAc,EAAE,EAAE;IACxB,cAAc,GAAG,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,CAAC,8BAA8B,EAAE,CAAC,OAAO,EAAE,EAAE;QAClD,0BAAe,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC/C,cAAc,CAAC,IAAI,CAAC,qCAAqC,EAAE,OAAO,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"desktopCapturer.js","sourceRoot":"","sources":["desktopCapturer.ts"],"names":[],"mappings":";AACA,uCAA2C;AAE3C,IAAI,cAAc,CAAC;AAsBjB,CAAC;AApBH,iBAAS,CAAC,MAAc,EAAE,EAAE;IACxB,cAAc,GAAG,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,CAAC,8BAA8B,EAAE,CAAC,OAAO,EAAE,EAAE;QAClD,0BAAe,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAE/C,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAC7B,OAAO;oBACH,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,EAAE,EAAE,GAAG,CAAC,EAAE;oBACV,UAAU,EAAE,GAAG,CAAC,UAAU;oBAC1B,SAAS,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;iBAC7D,CAAC;YACN,CAAC,CAAC,CAAC;YAEH,cAAc,CAAC,IAAI,CAAC,qCAAqC,EAAE,MAAM,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AAGP,CAAC,CAAC"} \ No newline at end of file diff --git a/ElectronNET.Host/api/desktopCapturer.ts b/ElectronNET.Host/api/desktopCapturer.ts index 4cc8a33..dd28600 100644 --- a/ElectronNET.Host/api/desktopCapturer.ts +++ b/ElectronNET.Host/api/desktopCapturer.ts @@ -7,7 +7,20 @@ export = (socket: Socket) => { electronSocket = socket; socket.on('desktop-capturer-get-sources', (options) => { desktopCapturer.getSources(options).then(sources => { - electronSocket.emit('desktop-capturer-get-sources-result', sources); + + const result = sources.map(src => { + return { + appIcon: src.appIcon, + name: src.name, + id: src.id, + display_id: src.display_id, + thumbnail: { 1: src.thumbnail.toPNG().toString('base64') } + }; + }); + + electronSocket.emit('desktop-capturer-get-sources-result', result); }); }); -}; + + +};;