Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the livekit URL in matroyshka mode #1225

Merged
merged 3 commits into from
Jul 11, 2023
Merged

Add the livekit URL in matroyshka mode #1225

merged 3 commits into from
Jul 11, 2023

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Jul 10, 2023

This is a bit of a hack, as commented. The way to make it less of a hack is there too.

Fixes embedded mode, although users will get a permission prompt without matrix-org/matrix-react-sdk#11209.

Fixes #1201

This is a bit of a hack, as commented. The way to make it less of a
hack is there too.

Fixes embedded mode, although users will get a permission prompt
without matrix-org/matrix-react-sdk#11209.

Fixes #1201
@dbkr dbkr added the T-Defect Something isn't working: bugs, crashes, hangs, vulnerabilities, or other reported problems label Jul 10, 2023
@dbkr dbkr requested a review from a team as a code owner July 10, 2023 12:42
@codecov-commenter
Copy link

codecov-commenter commented Jul 10, 2023

Codecov Report

❗ No coverage uploaded for pull request base (livekit@3c560ed). Click here to learn what that means.
Patch coverage: 0.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##             livekit    #1225   +/-   ##
==========================================
  Coverage           ?   25.38%           
==========================================
  Files              ?       48           
  Lines              ?     1950           
  Branches           ?      297           
==========================================
  Hits               ?      495           
  Misses             ?     1425           
  Partials           ?       30           
Flag Coverage Δ
unittests 25.38% <0.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
src/widget.ts 17.50% <0.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.


const clientPromise = new Promise<MatrixClient>((resolve) => {
(async () => {
await Config.init();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems to be redundant with what the initializer is doing? do we not have the initializer in embedded mode?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, sorry, added a comment

Copy link
Contributor

@toger5 toger5 Jul 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This migh result in duplicated downloads of the json right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Config.init has a few lines that look like this:

    if (Config.internalInstance?.initPromise) {
      return Config.internalInstance.initPromise;
    }

so that doesn't appear to be the case. If there's already a request promise in flight, it returns that same promise.

@dbkr dbkr merged commit 46ad463 into livekit Jul 11, 2023
@daniel-abramov daniel-abramov deleted the dbkr/lk_url_matroyshka branch July 19, 2023 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
T-Defect Something isn't working: bugs, crashes, hangs, vulnerabilities, or other reported problems
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix embedded mode
5 participants