From be5906e653f91061cd14703086c4a1cb7f74ba30 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 7 Jul 2024 00:56:15 +0200 Subject: [PATCH] fixed non-deletable attachments if asset not found, added missing noise suppression --- flake.lock | 88 ++++--------- flake.nix | 2 +- package-lock.json | 235 +++++++++++++++++++---------------- package.json | 2 +- ui/package.json | 2 +- ui/src/attachment-element.ts | 90 +++++++------- ui/src/room-view.ts | 6 +- we.dev.config.ts | 14 +-- 8 files changed, 212 insertions(+), 227 deletions(-) diff --git a/flake.lock b/flake.lock index d3655d7..0300489 100644 --- a/flake.lock +++ b/flake.lock @@ -120,37 +120,19 @@ "type": "indirect" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "holochain": { "flake": false, "locked": { - "lastModified": 1718142789, - "narHash": "sha256-Lam1hWLqi+zv0umdTIIHK9YKHVWQrI/Z4AySo97xK9E=", + "lastModified": 1719968525, + "narHash": "sha256-smpK/6bTj6rz4L5JE4LNEPXKS2FHX9TuMj2hg473ggI=", "owner": "holochain", "repo": "holochain", - "rev": "582f05b66b690448b1574d1aa6004114ff98187f", + "rev": "31c75c07234a573b18f07cb05c2961809bf1c0a1", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3.1", + "ref": "holochain-0.4.0-dev.11", "repo": "holochain", "type": "github" } @@ -190,11 +172,11 @@ ] }, "locked": { - "lastModified": 1718595024, - "narHash": "sha256-aWmx2q7l1PXOG28VHBoyQyPLr9hw7IWjLrnqDzFGid4=", + "lastModified": 1720125457, + "narHash": "sha256-FFUg2nnXEXwePi+Y2uL8CATjeWALqRIF3Je1WYCm430=", "owner": "holochain", "repo": "holochain", - "rev": "44e59aa1dbe5f91b9f221bf0efeabdee9c16d313", + "rev": "3297a053c39db9c2c37794b6219b8857320d97d4", "type": "github" }, "original": { @@ -211,16 +193,16 @@ "scaffolding": "scaffolding" }, "locked": { - "dir": "versions/0_3", - "lastModified": 1718595024, - "narHash": "sha256-aWmx2q7l1PXOG28VHBoyQyPLr9hw7IWjLrnqDzFGid4=", + "dir": "versions/weekly", + "lastModified": 1720125457, + "narHash": "sha256-FFUg2nnXEXwePi+Y2uL8CATjeWALqRIF3Je1WYCm430=", "owner": "holochain", "repo": "holochain", - "rev": "44e59aa1dbe5f91b9f221bf0efeabdee9c16d313", + "rev": "3297a053c39db9c2c37794b6219b8857320d97d4", "type": "github" }, "original": { - "dir": "versions/0_3", + "dir": "versions/weekly", "owner": "holochain", "repo": "holochain", "type": "github" @@ -229,16 +211,16 @@ "lair": { "flake": false, "locked": { - "lastModified": 1709335027, - "narHash": "sha256-rKMhh7TLuR1lqze2YFWZCGYKZQoB4dZxjpX3sb7r7Jk=", + "lastModified": 1717684904, + "narHash": "sha256-vcXt67Tl1qwVUkx8CBevdQocqZXUEeoXjaYw86ljsYo=", "owner": "holochain", "repo": "lair", - "rev": "826be915efc839d1d1b8a2156b158999b8de8d5b", + "rev": "6a84ed490fc7074d107e38bbb4a8d707e9b8e066", "type": "github" }, "original": { "owner": "holochain", - "ref": "lair_keystore-v0.4.4", + "ref": "lair_keystore-v0.4.5", "repo": "lair", "type": "github" } @@ -246,16 +228,16 @@ "launcher": { "flake": false, "locked": { - "lastModified": 1717431387, - "narHash": "sha256-+VvWwBmxcgePV1L6kU2mSkg3emMiMgpdQnCqvQJkRPk=", + "lastModified": 1715106263, + "narHash": "sha256-a7iQ8pKGz6fghJrtXq0Xamp57GE8Hd3w5YQASzz5Wlk=", "owner": "holochain", "repo": "launcher", - "rev": "9d9cab5e6b57e1c278113921ff203e515c8bbd2e", + "rev": "92bd39e1c66912d61c35c4725d7b106959888670", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3", + "ref": "holochain-weekly", "repo": "launcher", "type": "github" } @@ -352,18 +334,17 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "holochain-flake", "nixpkgs" ] }, "locked": { - "lastModified": 1718504420, - "narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=", + "lastModified": 1719714047, + "narHash": "sha256-MeNPopLLv63EZj5L43j4TZkmW4wj1ouoc/h/E20sl/U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9", + "rev": "cb216719ce89a43dfb3d1b86a9575e89f4b727a4", "type": "github" }, "original": { @@ -375,34 +356,19 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1717661456, - "narHash": "sha256-e+9YRRFJg89rfHDWtumEa33rpa2vmij/zw7Uwl6BP/g=", + "lastModified": 1719577631, + "narHash": "sha256-LPdMm14MPEQBbt6NgzVtA5Z38tGC032G0dg90qgJZlo=", "owner": "holochain", "repo": "scaffolding", - "rev": "1ffc9eb350b82784a8fb609073f1c7eccf2e0fc0", + "rev": "b481b2b3cb0a88bb01097dd26ea0dba84491c58a", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.3", + "ref": "holochain-weekly", "repo": "scaffolding", "type": "github" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3e8fe5c..7a0b1a9 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Template for Holochain app development"; inputs = { - holochain-nix-versions.url = "github:holochain/holochain?dir=versions/0_3"; + holochain-nix-versions.url = "github:holochain/holochain?dir=versions/weekly"; holochain-flake = { url = "github:holochain/holochain"; diff --git a/package-lock.json b/package-lock.json index 6bb2660..d207164 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ ], "devDependencies": { "@holochain-playground/cli": "^0.1.1", - "@lightningrodlabs/we-dev-cli": "0.12.0-dev.5", + "@lightningrodlabs/we-dev-cli": "0.13.0-alpha.4", "concurrently": "^6.2.1", "electron": "^25.6.0", "rimraf": "^3.0.2" @@ -34,7 +34,8 @@ }, "../../lightningrodlabs/we/libs/we-applet": { "name": "@lightningrodlabs/we-applet", - "version": "0.17.0", + "version": "0.17.1", + "extraneous": true, "license": "MIT", "dependencies": { "@holochain-open-dev/profiles": "0.400.0-dev.1", @@ -1551,22 +1552,20 @@ } }, "node_modules/@lightningrodlabs/we-applet": { - "version": "0.17.0-dev.3", - "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-applet/-/we-applet-0.17.0-dev.3.tgz", - "integrity": "sha512-TV6gbz3UAXTJydR4VQsJMCGIOhWGQ3zmgR8bVmh4selV1hu2y0GdwewADnQ90PvWj11nMH5JGpcWzkNGzkxSZw==", - "dev": true, + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-applet/-/we-applet-0.17.1.tgz", + "integrity": "sha512-RoUttzPPziSfq+cbtw6k/ZjZkHsUMJOm0lSmI9Vo1wOPy3x8CK9Iau9mjyXCwiuGzKR8+1AJCTHSNlGyyzIabw==", "dependencies": { "@holochain-open-dev/profiles": "0.400.0-dev.1", - "@holochain/client": "0.18.0-dev.1", + "@holochain/client": "0.18.0-dev.3", "@msgpack/msgpack": "^2.8.0", "js-base64": "^3.7.2" } }, "node_modules/@lightningrodlabs/we-applet/node_modules/@holochain/client": { - "version": "0.18.0-dev.1", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.18.0-dev.1.tgz", - "integrity": "sha512-5BW+kG/VoB+AhrzquoZ1QHbc1fGwujLs2o6Ct+aOkqXATjQNFif6auX50cagZSaq9hWX5VuZLcqdDTXLWKhNrw==", - "dev": true, + "version": "0.18.0-dev.3", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.18.0-dev.3.tgz", + "integrity": "sha512-TlEJKKCoB/10VhZt7izHjOCts99zUv75flAaPr7Czs7fsiXQ5N2Yspjer5KosNsTIy2tSjzh9KRKQynFq58apA==", "dependencies": { "@bitgo/blake2b": "^3.2.4", "@holochain/serialization": "^0.1.0-beta-rc.3", @@ -1583,29 +1582,31 @@ } }, "node_modules/@lightningrodlabs/we-dev-cli": { - "version": "0.12.0-dev.5", - "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-dev-cli/-/we-dev-cli-0.12.0-dev.5.tgz", - "integrity": "sha512-MmRdnDEJKExPLi1oSnzB4Mtc2ELg2CeuYrNQt2W9Lfc2+0jp9/qYl2B2rTBQJ8T3XckFDir8JLGSHE8qXTjhaQ==", + "version": "0.13.0-alpha.4", + "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-dev-cli/-/we-dev-cli-0.13.0-alpha.4.tgz", + "integrity": "sha512-+/zcqOJhd0Vs/xpI2bww5yTZwcp63ZiLGThLZ0B2XjIXZSDZXoeqnHpBG+8ji2P2JqMVYWUU2LvIfzp0SsyK+g==", "dev": true, "hasInstallScript": true, "dependencies": { "@electron-toolkit/preload": "^2.0.0", "@electron-toolkit/utils": "^2.0.0", "@holochain-open-dev/utils": "0.400.0-dev.0", - "@holochain/client": "0.18.0-dev.1", - "@lightningrodlabs/we-applet": "0.17.0-dev.3", - "@lightningrodlabs/we-rust-utils": "0.300.1", + "@holochain/client": "0.18.0-dev.3", + "@lightningrodlabs/we-applet": "0.17.1", + "@lightningrodlabs/we-rust-utils": "0.400.0-dev.7", + "@matthme/electron-updater": "6.3.0-alpha.1", "@msgpack/msgpack": "^2.8.0", + "adm-zip": "0.5.14", "bufferutil": "4.0.8", "commander": "11.1.0", "electron": "^29.3.1", "electron-context-menu": "3.6.1", - "electron-updater": "6.1.8", "mime": "4.0.0", "nanoid": "5.0.4", "split": "1.0.1", "ts-node": "10.9.2", "utf-8-validate": "^6.0.3", + "uuid": "9.0.1", "winston": "3.11.0" }, "bin": { @@ -1613,9 +1614,9 @@ } }, "node_modules/@lightningrodlabs/we-dev-cli/node_modules/@holochain/client": { - "version": "0.18.0-dev.1", - "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.18.0-dev.1.tgz", - "integrity": "sha512-5BW+kG/VoB+AhrzquoZ1QHbc1fGwujLs2o6Ct+aOkqXATjQNFif6auX50cagZSaq9hWX5VuZLcqdDTXLWKhNrw==", + "version": "0.18.0-dev.3", + "resolved": "https://registry.npmjs.org/@holochain/client/-/client-0.18.0-dev.3.tgz", + "integrity": "sha512-TlEJKKCoB/10VhZt7izHjOCts99zUv75flAaPr7Czs7fsiXQ5N2Yspjer5KosNsTIy2tSjzh9KRKQynFq58apA==", "dev": true, "dependencies": { "@bitgo/blake2b": "^3.2.4", @@ -1677,25 +1678,38 @@ "node": "^18 || >=20" } }, + "node_modules/@lightningrodlabs/we-dev-cli/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "dev": true, + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/@lightningrodlabs/we-rust-utils": { - "version": "0.300.1", - "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-rust-utils/-/we-rust-utils-0.300.1.tgz", - "integrity": "sha512-UrP0x6eCVksh2M9sC9+rNPUIgVxIeiNXvVV3X60XvBc+KjEM5saceFn2Z3zhQyVAsSA70qBS0vxYm+FgWdJNAA==", + "version": "0.400.0-dev.7", + "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-rust-utils/-/we-rust-utils-0.400.0-dev.7.tgz", + "integrity": "sha512-qBxCu0wR8YtApvdxQXt7v+3OYLOM1jWW6eD43P0lAhFmL+xKw+VMeR6h0EBCTF2p9t/vfbyG5PjI5sz/JiALYQ==", "dev": true, "engines": { "node": ">= 10" }, "optionalDependencies": { - "@lightningrodlabs/we-rust-utils-darwin-arm64": "0.300.1", - "@lightningrodlabs/we-rust-utils-darwin-x64": "0.300.1", - "@lightningrodlabs/we-rust-utils-linux-x64-gnu": "0.300.1", - "@lightningrodlabs/we-rust-utils-win32-x64-msvc": "0.300.1" + "@lightningrodlabs/we-rust-utils-darwin-arm64": "0.400.0-dev.7", + "@lightningrodlabs/we-rust-utils-darwin-x64": "0.400.0-dev.7", + "@lightningrodlabs/we-rust-utils-linux-x64-gnu": "0.400.0-dev.7", + "@lightningrodlabs/we-rust-utils-win32-x64-msvc": "0.400.0-dev.7" } }, "node_modules/@lightningrodlabs/we-rust-utils-darwin-arm64": { - "version": "0.300.1", - "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-rust-utils-darwin-arm64/-/we-rust-utils-darwin-arm64-0.300.1.tgz", - "integrity": "sha512-TiaZmMOOGgLYcA06to/VHCMn+Ug93Dh6kzcu8c7E7CmdzL6OjLErz/ZSTlO6eRbITX6X7ube13ePpKqEc1Doxw==", + "version": "0.400.0-dev.7", + "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-rust-utils-darwin-arm64/-/we-rust-utils-darwin-arm64-0.400.0-dev.7.tgz", + "integrity": "sha512-ikZ/wo+Q1PKdYj14Vlcl6Pv7giVRK+YtnN5/0awNpqgNUmG9PKLrTif6boIsoMrC1I3BMU+zDmwZBPHfi6QuFw==", "cpu": [ "arm64" ], @@ -1709,9 +1723,9 @@ } }, "node_modules/@lightningrodlabs/we-rust-utils-darwin-x64": { - "version": "0.300.1", - "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-rust-utils-darwin-x64/-/we-rust-utils-darwin-x64-0.300.1.tgz", - "integrity": "sha512-9cpr2qUbEgz0OOHJFQ1BAF7LokDoTGX2lQO2D9AxE6w5uwLzc50C9TjKAvBve//JbnuCjD6oxZwbK/YeWWfPwQ==", + "version": "0.400.0-dev.7", + "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-rust-utils-darwin-x64/-/we-rust-utils-darwin-x64-0.400.0-dev.7.tgz", + "integrity": "sha512-0x/SMNOpvLFq20antuah9pkdEOi5AmikWTK1IDU1Cj9IGdj5nyvxb63GtCxQgv8r4mHjjAYVlEtmW1+fD6RyjA==", "cpu": [ "x64" ], @@ -1725,9 +1739,9 @@ } }, "node_modules/@lightningrodlabs/we-rust-utils-linux-x64-gnu": { - "version": "0.300.1", - "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-rust-utils-linux-x64-gnu/-/we-rust-utils-linux-x64-gnu-0.300.1.tgz", - "integrity": "sha512-jmNs1qfGyA4wodzJk60jaSKmVECjAgg91Iv5rgfcmYTKBbfOZHHUs471Du1j5ta5zVxx1R/tr/P/hSZc6Dqkmw==", + "version": "0.400.0-dev.7", + "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-rust-utils-linux-x64-gnu/-/we-rust-utils-linux-x64-gnu-0.400.0-dev.7.tgz", + "integrity": "sha512-vnRDnw/ZqUGpQIrD1RVrdbiP5mCiAgXwkDjyfr199bJpwHNxwQ2q+w49pftRrOtMANHRYe6hkNITF79W8yobPg==", "cpu": [ "x64" ], @@ -1741,9 +1755,9 @@ } }, "node_modules/@lightningrodlabs/we-rust-utils-win32-x64-msvc": { - "version": "0.300.1", - "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-rust-utils-win32-x64-msvc/-/we-rust-utils-win32-x64-msvc-0.300.1.tgz", - "integrity": "sha512-fVyyENCgtFXfZb/IxRUgwzgMBv6xfLIw1fETLrx/Jrj1FOQ0ai23fNWYsctHugHaw/nEoL7L22tgoWbZ6n0rPw==", + "version": "0.400.0-dev.7", + "resolved": "https://registry.npmjs.org/@lightningrodlabs/we-rust-utils-win32-x64-msvc/-/we-rust-utils-win32-x64-msvc-0.400.0-dev.7.tgz", + "integrity": "sha512-M7aIpmn5OYOONcYcCGr4fKkcj9qcLm8ufsV1RT1m7w6obr4c8wfv/Z3GsRiYpH4w9mr+HyuMjC8nb4b3w+4mMQ==", "cpu": [ "x64" ], @@ -1801,6 +1815,66 @@ "@lit/reactive-element": "^1.0.0 || ^2.0.0" } }, + "node_modules/@matthme/electron-updater": { + "version": "6.3.0-alpha.1", + "resolved": "https://registry.npmjs.org/@matthme/electron-updater/-/electron-updater-6.3.0-alpha.1.tgz", + "integrity": "sha512-k6oaZzT3XWE6hY1IchR5kZ0eEb9sVp9K3+BVtG88rA8aqvI9OJJrGZlCFStO4AXmLgZ/U/MUbWih4eHMS9eDcQ==", + "dev": true, + "dependencies": { + "builder-util-runtime": "9.2.5-alpha.2", + "fs-extra": "^10.1.0", + "js-yaml": "^4.1.0", + "lazy-val": "^1.0.5", + "lodash.escaperegexp": "^4.1.2", + "lodash.isequal": "^4.5.0", + "semver": "^7.3.8", + "tiny-typed-emitter": "^2.1.0" + } + }, + "node_modules/@matthme/electron-updater/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/@matthme/electron-updater/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@matthme/electron-updater/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@matthme/electron-updater/node_modules/semver": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@mdi/js": { "version": "7.3.67", "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.3.67.tgz", @@ -2273,6 +2347,15 @@ "node": ">=0.4.0" } }, + "node_modules/adm-zip": { + "version": "0.5.14", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.14.tgz", + "integrity": "sha512-DnyqqifT4Jrcvb8USYjp6FHtBpEIz1mnXu6pTRHZ0RL69LbQYiO+0lDFg5+OKA7U29oWSs3a/i8fhn8ZcceIWg==", + "dev": true, + "engines": { + "node": ">=12.0" + } + }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -2824,9 +2907,9 @@ } }, "node_modules/builder-util-runtime": { - "version": "9.2.3", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz", - "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==", + "version": "9.2.5-alpha.2", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.5-alpha.2.tgz", + "integrity": "sha512-/Ln2ddejGj2HNMJ+X66mKHRcOvmRzUO/dSi8t4hSV64J7IA+DE+mqDb+zogIE2gin7p7YwcGiOkKny4nwPPPXg==", "dev": true, "dependencies": { "debug": "^4.3.4", @@ -3765,66 +3848,6 @@ "dev": true, "peer": true }, - "node_modules/electron-updater": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.8.tgz", - "integrity": "sha512-hhOTfaFAd6wRHAfUaBhnAOYc+ymSGCWJLtFkw4xJqOvtpHmIdNHnXDV9m1MHC+A6q08Abx4Ykgyz/R5DGKNAMQ==", - "dev": true, - "dependencies": { - "builder-util-runtime": "9.2.3", - "fs-extra": "^10.1.0", - "js-yaml": "^4.1.0", - "lazy-val": "^1.0.5", - "lodash.escaperegexp": "^4.1.2", - "lodash.isequal": "^4.5.0", - "semver": "^7.3.8", - "tiny-typed-emitter": "^2.1.0" - } - }, - "node_modules/electron-updater/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/electron-updater/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/electron-updater/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/electron-updater/node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/electron/node_modules/@types/node": { "version": "18.19.32", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.32.tgz", @@ -8651,7 +8674,7 @@ } }, "ui": { - "version": "0.6.0-dev.2", + "version": "0.6.0", "dependencies": { "@fontsource-variable/baloo-2": "5.0.19", "@fontsource-variable/noto-sans-sc": "^5.0.5", @@ -8769,10 +8792,6 @@ "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, - "ui/node_modules/@lightningrodlabs/we-applet": { - "resolved": "../../lightningrodlabs/we/libs/we-applet", - "link": true - }, "ui/node_modules/@typescript-eslint/eslint-plugin": { "version": "6.16.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.16.0.tgz", diff --git a/package.json b/package.json index 38c0cbe..da4a4be 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@holochain-playground/cli": "^0.1.1", - "@lightningrodlabs/we-dev-cli": "0.12.0-dev.5", + "@lightningrodlabs/we-dev-cli": "0.13.0-alpha.4", "concurrently": "^6.2.1", "electron": "^25.6.0", "rimraf": "^3.0.2" diff --git a/ui/package.json b/ui/package.json index 74f17e6..0045b0a 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "ui", - "version": "0.6.0", + "version": "0.6.1", "scripts": { "start": "vite --port $UI_PORT --clearScreen false", "build": "vite build", diff --git a/ui/src/attachment-element.ts b/ui/src/attachment-element.ts index 0c29bce..0b6dc4b 100644 --- a/ui/src/attachment-element.ts +++ b/ui/src/attachment-element.ts @@ -69,17 +69,17 @@ export class AttachmentElement extends LitElement { } async openAsset() { - await this._weaveClient.openWal(this._wal!); + if (this._wal) { + await this._weaveClient.openWal(this._wal); + } } removeAttachment() { - if (this._wal) { - this.dispatchEvent( - new CustomEvent('remove-attachment', { - detail: this.entryRecord, - }) - ); - } + this.dispatchEvent( + new CustomEvent('remove-attachment', { + detail: this.entryRecord, + }) + ); } render() { @@ -95,12 +95,12 @@ export class AttachmentElement extends LitElement { }} >
- ${this._assetInfo - ? html` -
+
+ ${this._assetInfo + ? html` ${this._assetAppletInfo ? html` ${this._assetInfo.assetInfo.name} -
- -
{ - this.removeAttachment(); - e.stopPropagation(); - }} - @keypress=${(e: KeyboardEvent) => { - if (e.key === 'Enter' || e.key === ' ') { - this.removeAttachment(); - } - }} - > - -
- - ` - : html`
- Asset not found. -
`} + ` + : html`Asset not found`} +
+ +
{ + this.removeAttachment(); + e.stopPropagation(); + }} + @keypress=${(e: KeyboardEvent) => { + if (e.key === 'Enter' || e.key === ' ') { + this.removeAttachment(); + } + }} + > + +
+
`; @@ -178,16 +176,16 @@ export class AttachmentElement extends LitElement { overflow: hidden; } - .open-area:hover { + .active:hover { background: #eaecfb; } - .open-area:focus-visible { + .active:focus-visible { background: #eaecfb; } .disabled { - cursor: auto; + cursor: default; opacity: 0.7; } diff --git a/ui/src/room-view.ts b/ui/src/room-view.ts index 4b9a701..1c06f4f 100644 --- a/ui/src/room-view.ts +++ b/ui/src/room-view.ts @@ -652,7 +652,10 @@ export class RoomView extends LitElement { } else { try { this._mainStream = await navigator.mediaDevices.getUserMedia({ - audio: true, + audio: { + noiseSuppression: true, + echoCancellation: true, + }, }); this._microphone = true; } catch (e: any) { @@ -662,7 +665,6 @@ export class RoomView extends LitElement { ); return; } - const audioTrack = this._mainStream?.getAudioTracks()[0]; Object.values(this._openConnections).forEach(conn => { conn.peer.addStream(this._mainStream!); }); diff --git a/we.dev.config.ts b/we.dev.config.ts index 42ed466..27749fb 100644 --- a/we.dev.config.ts +++ b/we.dev.config.ts @@ -54,12 +54,12 @@ export default defineConfig({ // registeringAgent: 1, // joiningAgents: [2], // }, - // { - // name: 'KanDo', - // instanceName: 'KanDo', - // registeringAgent: 1, - // joiningAgents: [2], - // }, + { + name: 'KanDo', + instanceName: 'KanDo', + registeringAgent: 1, + joiningAgents: [2], + }, ], }, ], @@ -89,7 +89,7 @@ export default defineConfig({ }, source: { type: 'https', - url: 'https://github.com/holochain-apps/kando/releases/download/v0.9.3/kando.webhapp', + url: 'https://github.com/holochain-apps/kando/releases/download/v0.10.4/kando.webhapp', }, }, {