From 394aa73d8bfbf7e7d9099f71dd69915cd82e249c Mon Sep 17 00:00:00 2001 From: Douglas Gubert Date: Tue, 22 Jun 2021 15:51:51 -0300 Subject: [PATCH] [FIX] Apps not syncing status correctly on HA setups (#22415) --- app/apps/server/communication/websockets.js | 4 +- package-lock.json | 49 +++++++++------------ package.json | 2 +- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/app/apps/server/communication/websockets.js b/app/apps/server/communication/websockets.js index ead46d67e59..fd9360dce47 100644 --- a/app/apps/server/communication/websockets.js +++ b/app/apps/server/communication/websockets.js @@ -68,7 +68,7 @@ export class AppServerListener { const storageItem = await this.orch.getStorage().retrieveOne(appId); - await this.orch.getManager().update(storageItem.zip); + await this.orch.getManager().update(Buffer.from(storageItem.zip, 'base64')); this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_UPDATED, appId); } @@ -79,7 +79,7 @@ export class AppServerListener { return; } - await this.orch.getManager().remove(appId); + await this.orch.getManager().removeLocal(appId); this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_REMOVED, appId); } diff --git a/package-lock.json b/package-lock.json index cd25a2cc9ff..f6e600c6db1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6241,9 +6241,9 @@ } }, "@rocket.chat/apps-engine": { - "version": "1.27.0-alpha.5192", - "resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.27.0-alpha.5192.tgz", - "integrity": "sha512-mN419xEns2P8UVV32nipfHyOll/EWwzUT0nOuMDn3eFq3h4TmYZms9rQJ/6ti62A86H9nJBwVwT5uoDnioJG7g==", + "version": "1.27.0-alpha.5237", + "resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.27.0-alpha.5237.tgz", + "integrity": "sha512-r1LCZ2ikR3bTK49hrB6DHFf/FVlLo32K2UmK7okdjgHvUQtjZUsweFSo0zfvR2B5AsStQ7SePPT7FZtCTGZ8RQ==", "requires": { "adm-zip": "^0.4.9", "cryptiles": "^4.1.3", @@ -6251,13 +6251,6 @@ "semver": "^5.5.0", "stack-trace": "0.0.10", "uuid": "^3.2.1" - }, - "dependencies": { - "adm-zip": { - "version": "0.4.16", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz", - "integrity": "sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==" - } } }, "@rocket.chat/css-in-js": { @@ -23917,7 +23910,7 @@ }, "chownr": { "version": "1.1.1", - "resolved": false, + "resolved": "", "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true, "optional": true @@ -23952,7 +23945,7 @@ }, "debug": { "version": "4.1.1", - "resolved": false, + "resolved": "", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "optional": true, @@ -23983,7 +23976,7 @@ }, "fs-minipass": { "version": "1.2.5", - "resolved": false, + "resolved": "", "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "optional": true, @@ -24017,7 +24010,7 @@ }, "glob": { "version": "7.1.3", - "resolved": false, + "resolved": "", "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, @@ -24049,7 +24042,7 @@ }, "ignore-walk": { "version": "3.0.1", - "resolved": false, + "resolved": "", "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, @@ -24070,7 +24063,7 @@ }, "inherits": { "version": "2.0.3", - "resolved": false, + "resolved": "", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true, "optional": true @@ -24118,7 +24111,7 @@ }, "minipass": { "version": "2.3.5", - "resolved": false, + "resolved": "", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, "optional": true, @@ -24129,7 +24122,7 @@ }, "minizlib": { "version": "1.2.1", - "resolved": false, + "resolved": "", "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "dev": true, "optional": true, @@ -24149,7 +24142,7 @@ }, "ms": { "version": "2.1.1", - "resolved": false, + "resolved": "", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true, "optional": true @@ -24163,7 +24156,7 @@ }, "needle": { "version": "2.3.0", - "resolved": false, + "resolved": "", "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", "dev": true, "optional": true, @@ -24175,7 +24168,7 @@ }, "node-pre-gyp": { "version": "0.12.0", - "resolved": false, + "resolved": "", "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", "dev": true, "optional": true, @@ -24205,14 +24198,14 @@ }, "npm-bundled": { "version": "1.0.6", - "resolved": false, + "resolved": "", "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.4.1", - "resolved": false, + "resolved": "", "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", "dev": true, "optional": true, @@ -24292,7 +24285,7 @@ }, "process-nextick-args": { "version": "2.0.0", - "resolved": false, + "resolved": "", "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true @@ -24337,7 +24330,7 @@ }, "rimraf": { "version": "2.6.3", - "resolved": false, + "resolved": "", "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, @@ -24368,7 +24361,7 @@ }, "semver": { "version": "5.7.0", - "resolved": false, + "resolved": "", "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true, "optional": true @@ -24428,7 +24421,7 @@ }, "tar": { "version": "4.4.8", - "resolved": false, + "resolved": "", "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "dev": true, "optional": true, @@ -24468,7 +24461,7 @@ }, "yallist": { "version": "3.0.3", - "resolved": false, + "resolved": "", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", "dev": true, "optional": true diff --git a/package.json b/package.json index 9c7a8a96ebd..b2dfd357424 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ "@nivo/heatmap": "^0.61.0", "@nivo/line": "^0.61.1", "@nivo/pie": "^0.61.1", - "@rocket.chat/apps-engine": "1.27.0-alpha.5192", + "@rocket.chat/apps-engine": "1.27.0-alpha.5237", "@rocket.chat/css-in-js": "^0.6.3-dev.261", "@rocket.chat/emitter": "^0.26.0", "@rocket.chat/fuselage": "^0.6.3-dev.266",