PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Let widget driver send error details (#28357)

Browse source 
* Let widget driver send error details

* Match new widget API types

* Don't @link across packages

in case web documentation generation disallows it.

* Update matrix-widget-api

* Update matrix-js-sdk

Include matrix-org/matrix-js-sdk#4507 to fix playwright CI
This commit is contained in:
Andrew Ferrazzutti 2024-11-11 11:39:17 -05:00 committed by GitHub
parent 17de66140d
commit c8c107405f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -127,7 +127,7 @@
"matrix-encrypt-attachment": "^1.0.3", "matrix-encrypt-attachment": "^1.0.3",
"matrix-events-sdk": "0.0.1", "matrix-events-sdk": "0.0.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-widget-api": "^1.9.0", "matrix-widget-api": "^1.10.0",
"memoize-one": "^6.0.0", "memoize-one": "^6.0.0",
"oidc-client-ts": "^3.0.1", "oidc-client-ts": "^3.0.1",
"opus-recorder": "^8.0.3", "opus-recorder": "^8.0.3",

13
src/stores/widgets/StopGapWidgetDriver.ts
View file

@ -24,6 +24,7 @@ import {
WidgetDriver, WidgetDriver,
WidgetEventCapability, WidgetEventCapability,
WidgetKind, WidgetKind,
IWidgetApiErrorResponseDataDetails,
ISearchUserDirectoryResult, ISearchUserDirectoryResult,
IGetMediaConfigResult, IGetMediaConfigResult,
UpdateDelayedEventAction, UpdateDelayedEventAction,
@ -33,6 +34,7 @@ import {
ITurnServer as IClientTurnServer, ITurnServer as IClientTurnServer,
EventType, EventType,
IContent, IContent,
MatrixError,
MatrixEvent, MatrixEvent,
Room, Room,
Direction, Direction,
@ -689,4 +691,15 @@ export class StopGapWidgetDriver extends WidgetDriver {
const blob = await response.blob(); const blob = await response.blob();
return { file: blob }; return { file: blob };
} }
/**
* Expresses a {@link MatrixError} as a JSON payload
* for use by Widget API error responses.
* @param error The error to handle.
* @returns The error expressed as a JSON payload,
* or undefined if it is not a {@link MatrixError}.
*/
public processError(error: unknown): IWidgetApiErrorResponseDataDetails | undefined {
return error instanceof MatrixError ? { matrix_api_error: error.asWidgetApiErrorData() } : undefined;
}
} }

12
yarn.lock
View file

@ -8309,7 +8309,7 @@ matrix-events-sdk@0.0.1:
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "34.10.0" version "34.10.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/5a1488ebd5552817b1e95265afe7b3baac1231a2" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6855ace6422082d173438cb23368d2fabc6a1086"
dependencies: dependencies:
"@babel/runtime" "^7.12.5" "@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-wasm" "^9.0.0" "@matrix-org/matrix-sdk-crypto-wasm" "^9.0.0"
@ -8320,7 +8320,7 @@ matrix-events-sdk@0.0.1:
jwt-decode "^4.0.0" jwt-decode "^4.0.0"
loglevel "^1.7.1" loglevel "^1.7.1"
matrix-events-sdk "0.0.1" matrix-events-sdk "0.0.1"
matrix-widget-api "^1.8.2" matrix-widget-api "^1.10.0"
oidc-client-ts "^3.0.1" oidc-client-ts "^3.0.1"
p-retry "4" p-retry "4"
sdp-transform "^2.14.1" sdp-transform "^2.14.1"
@ -8345,10 +8345,10 @@ matrix-web-i18n@^3.2.1:
minimist "^1.2.8" minimist "^1.2.8"
walk "^2.3.15" walk "^2.3.15"
matrix-widget-api@^1.8.2, matrix-widget-api@^1.9.0: matrix-widget-api@^1.10.0:
version "1.9.0" version "1.10.0"
resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-1.9.0.tgz#884136b405bd3c56e4ea285095c9e01ec52b6b1f" resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-1.10.0.tgz#d31ea073a5871a1fb1a511ef900b0c125a37bf55"
integrity sha512-au8mqralNDqrEvaVAkU37bXOb8I9SCe+ACdPk11QWw58FKstVq31q2wRz+qWA6J+42KJ6s1DggWbG/S3fEs3jw== integrity sha512-rkAJ29briYV7TJnfBVLVSKtpeBrBju15JZFSDP6wj8YdbCu1bdmlplJayQ+vYaw1x4fzI49Q+Nz3E85s46sRDw==
dependencies: dependencies:
"@types/events" "^3.0.0" "@types/events" "^3.0.0"
events "^3.2.0" events "^3.2.0"