Update app id on edit - #670

Merged
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id
Jan 3, 2023
Merged

Update app id on edit#670
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id

Conversation

@brad-richardson

@brad-richardsonbrad-richardson commented Jan 2, 2023

Copy link
Copy Markdown
Contributor

Description

Continuation of #658 to show new app art on edit, tested working on Moonlight QT/iOS.

Screenshot

IMG_628909436696-1
Note that the scaling is wrong for this image on iOS, I'll make a separate change in the moonlight client to fix.

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

@cgutman Any ideas about why app list refreshes don't seem to load properly on the qt client?

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

The commit should fix the iOS scaling issue: brad-richardson/moonlight-ios@33b0307 It's taking a while to install xcode/configure my env so haven't tested it yet.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/confighttp.cpp Outdated
// Add a property named "id" to the inputTree with a value of the current timestamp
// Time is in seconds because some Moonlight clients cannot accept more than a 32-bit integer
// Milliseconds would be a better option
time_t id = time(nullptr);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

time_t is 64-bit on modern systems to avoid the Y2038 issue. We should cast it to make sure it's actually 32-bit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That's my bad... I knew it would just be safe until 2038... but that would also assume the user has their clock set correctly.

I would really like to use milliseconds instead of seconds anyway, in the event someone is saving multiple apps with the upcoming API. The code I removed here got the value in milliseconds if we want to go back to that. https://github.com/LizardByte/Sunshine/compare/7ebe09223c41b16cb8feb421e64f0902e0a91353..21660ea083e217075102ce0bc9130c69bd358983

Using milliseconds probably over complicates this all though... so maybe stick with the time_t and have some logic to ensure that the id isn't already used?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

My fear with using a random number is it's possible for them to repeat. I've seen cases where random functions are not really very random at all.

Here's a potential idea. Use an incrementing counter and store the counter as a separate property in the apps.json. Then just use that value and add 1 to it when assigning a new id?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Given the small chance of collision with this generator vs potential bugs with something like a user-writable counter in a threaded context I would probably lean towards the former?

I could switch to a more precise timestamp with some truncation/casting but this felt a little safer to me

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

How about random then, but check if the id is already used? I feel if we allow it to duplicate, it definitely will happen. I'm used to the SQL auto incrementing style that eliminates the chance of duplication.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/process.cpp
@cgutman

Copy link
Copy Markdown
Collaborator

Any ideas about why app list refreshes don't seem to load properly on the qt client?

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

I think those were to avoid using app ID 0.

@ReenigneArcher

Copy link
Copy Markdown
Member

Can you also replace the ./src_assets/common/assets/box.png with this image? https://discord.com/channels/804382334370578482/1055290596304105572/1059455062243541082

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Yes, I'm noticing the app list on the mac client doesn't seem to refresh at all (even when I add a new app). I'll keep digging, I may have just put it in a bad state

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

I fixed the issue on the qt client, an ID above max signed 32-bit int was failing to parse. This PR should be ready now

@brad-richardson
brad-richardson marked this pull request as ready for review January 2, 2023 20:34
Comment threadsrc/process.cpp
ReenigneArcherand others added 9 commits January 2, 2023 18:20
When an application is saved, the current timestamp in milliseconds is added to as the application id. A timestamp was used instead of a random integer to prevent any chance of repeated values.
@ReenigneArcher
ReenigneArcher merged commit 052297a into LizardByte:nightlyJan 3, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@brad-richardson@cgutman@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Update app id on edit - #670

Merged
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id
Jan 3, 2023
Merged

Update app id on edit#670
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id

Conversation

@brad-richardson

@brad-richardsonbrad-richardson commented Jan 2, 2023

Copy link
Copy Markdown
Contributor

Description

Continuation of #658 to show new app art on edit, tested working on Moonlight QT/iOS.

Screenshot

IMG_628909436696-1
Note that the scaling is wrong for this image on iOS, I'll make a separate change in the moonlight client to fix.

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

@cgutman Any ideas about why app list refreshes don't seem to load properly on the qt client?

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

The commit should fix the iOS scaling issue: brad-richardson/moonlight-ios@33b0307 It's taking a while to install xcode/configure my env so haven't tested it yet.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/confighttp.cpp Outdated
// Add a property named "id" to the inputTree with a value of the current timestamp
// Time is in seconds because some Moonlight clients cannot accept more than a 32-bit integer
// Milliseconds would be a better option
time_t id = time(nullptr);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

time_t is 64-bit on modern systems to avoid the Y2038 issue. We should cast it to make sure it's actually 32-bit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That's my bad... I knew it would just be safe until 2038... but that would also assume the user has their clock set correctly.

I would really like to use milliseconds instead of seconds anyway, in the event someone is saving multiple apps with the upcoming API. The code I removed here got the value in milliseconds if we want to go back to that. https://github.com/LizardByte/Sunshine/compare/7ebe09223c41b16cb8feb421e64f0902e0a91353..21660ea083e217075102ce0bc9130c69bd358983

Using milliseconds probably over complicates this all though... so maybe stick with the time_t and have some logic to ensure that the id isn't already used?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

My fear with using a random number is it's possible for them to repeat. I've seen cases where random functions are not really very random at all.

Here's a potential idea. Use an incrementing counter and store the counter as a separate property in the apps.json. Then just use that value and add 1 to it when assigning a new id?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Given the small chance of collision with this generator vs potential bugs with something like a user-writable counter in a threaded context I would probably lean towards the former?

I could switch to a more precise timestamp with some truncation/casting but this felt a little safer to me

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

How about random then, but check if the id is already used? I feel if we allow it to duplicate, it definitely will happen. I'm used to the SQL auto incrementing style that eliminates the chance of duplication.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/process.cpp
@cgutman

Copy link
Copy Markdown
Collaborator

Any ideas about why app list refreshes don't seem to load properly on the qt client?

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

I think those were to avoid using app ID 0.

@ReenigneArcher

Copy link
Copy Markdown
Member

Can you also replace the ./src_assets/common/assets/box.png with this image? https://discord.com/channels/804382334370578482/1055290596304105572/1059455062243541082

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Yes, I'm noticing the app list on the mac client doesn't seem to refresh at all (even when I add a new app). I'll keep digging, I may have just put it in a bad state

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

I fixed the issue on the qt client, an ID above max signed 32-bit int was failing to parse. This PR should be ready now

@brad-richardson
brad-richardson marked this pull request as ready for review January 2, 2023 20:34
Comment threadsrc/process.cpp
ReenigneArcherand others added 9 commits January 2, 2023 18:20
When an application is saved, the current timestamp in milliseconds is added to as the application id. A timestamp was used instead of a random integer to prevent any chance of repeated values.
@ReenigneArcher
ReenigneArcher merged commit 052297a into LizardByte:nightlyJan 3, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@brad-richardson@cgutman@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Update app id on edit - #670

Merged
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id
Jan 3, 2023
Merged

Update app id on edit#670
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id

Conversation

@brad-richardson

@brad-richardsonbrad-richardson commented Jan 2, 2023

Copy link
Copy Markdown
Contributor

Description

Continuation of #658 to show new app art on edit, tested working on Moonlight QT/iOS.

Screenshot

IMG_628909436696-1
Note that the scaling is wrong for this image on iOS, I'll make a separate change in the moonlight client to fix.

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

@cgutman Any ideas about why app list refreshes don't seem to load properly on the qt client?

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

The commit should fix the iOS scaling issue: brad-richardson/moonlight-ios@33b0307 It's taking a while to install xcode/configure my env so haven't tested it yet.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/confighttp.cpp Outdated
// Add a property named "id" to the inputTree with a value of the current timestamp
// Time is in seconds because some Moonlight clients cannot accept more than a 32-bit integer
// Milliseconds would be a better option
time_t id = time(nullptr);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

time_t is 64-bit on modern systems to avoid the Y2038 issue. We should cast it to make sure it's actually 32-bit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That's my bad... I knew it would just be safe until 2038... but that would also assume the user has their clock set correctly.

I would really like to use milliseconds instead of seconds anyway, in the event someone is saving multiple apps with the upcoming API. The code I removed here got the value in milliseconds if we want to go back to that. https://github.com/LizardByte/Sunshine/compare/7ebe09223c41b16cb8feb421e64f0902e0a91353..21660ea083e217075102ce0bc9130c69bd358983

Using milliseconds probably over complicates this all though... so maybe stick with the time_t and have some logic to ensure that the id isn't already used?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

My fear with using a random number is it's possible for them to repeat. I've seen cases where random functions are not really very random at all.

Here's a potential idea. Use an incrementing counter and store the counter as a separate property in the apps.json. Then just use that value and add 1 to it when assigning a new id?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Given the small chance of collision with this generator vs potential bugs with something like a user-writable counter in a threaded context I would probably lean towards the former?

I could switch to a more precise timestamp with some truncation/casting but this felt a little safer to me

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

How about random then, but check if the id is already used? I feel if we allow it to duplicate, it definitely will happen. I'm used to the SQL auto incrementing style that eliminates the chance of duplication.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/process.cpp
@cgutman

Copy link
Copy Markdown
Collaborator

Any ideas about why app list refreshes don't seem to load properly on the qt client?

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

I think those were to avoid using app ID 0.

@ReenigneArcher

Copy link
Copy Markdown
Member

Can you also replace the ./src_assets/common/assets/box.png with this image? https://discord.com/channels/804382334370578482/1055290596304105572/1059455062243541082

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Yes, I'm noticing the app list on the mac client doesn't seem to refresh at all (even when I add a new app). I'll keep digging, I may have just put it in a bad state

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

I fixed the issue on the qt client, an ID above max signed 32-bit int was failing to parse. This PR should be ready now

@brad-richardson
brad-richardson marked this pull request as ready for review January 2, 2023 20:34
Comment threadsrc/process.cpp
ReenigneArcherand others added 9 commits January 2, 2023 18:20
When an application is saved, the current timestamp in milliseconds is added to as the application id. A timestamp was used instead of a random integer to prevent any chance of repeated values.
@ReenigneArcher
ReenigneArcher merged commit 052297a into LizardByte:nightlyJan 3, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@brad-richardson@cgutman@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Update app id on edit - #670

Merged
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id
Jan 3, 2023
Merged

Update app id on edit#670
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id

Conversation

@brad-richardson

@brad-richardsonbrad-richardson commented Jan 2, 2023

Copy link
Copy Markdown
Contributor

Description

Continuation of #658 to show new app art on edit, tested working on Moonlight QT/iOS.

Screenshot

IMG_628909436696-1
Note that the scaling is wrong for this image on iOS, I'll make a separate change in the moonlight client to fix.

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

@cgutman Any ideas about why app list refreshes don't seem to load properly on the qt client?

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

The commit should fix the iOS scaling issue: brad-richardson/moonlight-ios@33b0307 It's taking a while to install xcode/configure my env so haven't tested it yet.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/confighttp.cpp Outdated
// Add a property named "id" to the inputTree with a value of the current timestamp
// Time is in seconds because some Moonlight clients cannot accept more than a 32-bit integer
// Milliseconds would be a better option
time_t id = time(nullptr);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

time_t is 64-bit on modern systems to avoid the Y2038 issue. We should cast it to make sure it's actually 32-bit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That's my bad... I knew it would just be safe until 2038... but that would also assume the user has their clock set correctly.

I would really like to use milliseconds instead of seconds anyway, in the event someone is saving multiple apps with the upcoming API. The code I removed here got the value in milliseconds if we want to go back to that. https://github.com/LizardByte/Sunshine/compare/7ebe09223c41b16cb8feb421e64f0902e0a91353..21660ea083e217075102ce0bc9130c69bd358983

Using milliseconds probably over complicates this all though... so maybe stick with the time_t and have some logic to ensure that the id isn't already used?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

My fear with using a random number is it's possible for them to repeat. I've seen cases where random functions are not really very random at all.

Here's a potential idea. Use an incrementing counter and store the counter as a separate property in the apps.json. Then just use that value and add 1 to it when assigning a new id?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Given the small chance of collision with this generator vs potential bugs with something like a user-writable counter in a threaded context I would probably lean towards the former?

I could switch to a more precise timestamp with some truncation/casting but this felt a little safer to me

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

How about random then, but check if the id is already used? I feel if we allow it to duplicate, it definitely will happen. I'm used to the SQL auto incrementing style that eliminates the chance of duplication.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/process.cpp
@cgutman

Copy link
Copy Markdown
Collaborator

Any ideas about why app list refreshes don't seem to load properly on the qt client?

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

I think those were to avoid using app ID 0.

@ReenigneArcher

Copy link
Copy Markdown
Member

Can you also replace the ./src_assets/common/assets/box.png with this image? https://discord.com/channels/804382334370578482/1055290596304105572/1059455062243541082

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Yes, I'm noticing the app list on the mac client doesn't seem to refresh at all (even when I add a new app). I'll keep digging, I may have just put it in a bad state

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

I fixed the issue on the qt client, an ID above max signed 32-bit int was failing to parse. This PR should be ready now

@brad-richardson
brad-richardson marked this pull request as ready for review January 2, 2023 20:34
Comment threadsrc/process.cpp
ReenigneArcherand others added 9 commits January 2, 2023 18:20
When an application is saved, the current timestamp in milliseconds is added to as the application id. A timestamp was used instead of a random integer to prevent any chance of repeated values.
@ReenigneArcher
ReenigneArcher merged commit 052297a into LizardByte:nightlyJan 3, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@brad-richardson@cgutman@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Update app id on edit - #670

Merged
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id
Jan 3, 2023
Merged

Update app id on edit#670
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id

Conversation

@brad-richardson

@brad-richardsonbrad-richardson commented Jan 2, 2023

Copy link
Copy Markdown
Contributor

Description

Continuation of #658 to show new app art on edit, tested working on Moonlight QT/iOS.

Screenshot

IMG_628909436696-1
Note that the scaling is wrong for this image on iOS, I'll make a separate change in the moonlight client to fix.

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

@cgutman Any ideas about why app list refreshes don't seem to load properly on the qt client?

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

The commit should fix the iOS scaling issue: brad-richardson/moonlight-ios@33b0307 It's taking a while to install xcode/configure my env so haven't tested it yet.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/confighttp.cpp Outdated
// Add a property named "id" to the inputTree with a value of the current timestamp
// Time is in seconds because some Moonlight clients cannot accept more than a 32-bit integer
// Milliseconds would be a better option
time_t id = time(nullptr);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

time_t is 64-bit on modern systems to avoid the Y2038 issue. We should cast it to make sure it's actually 32-bit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That's my bad... I knew it would just be safe until 2038... but that would also assume the user has their clock set correctly.

I would really like to use milliseconds instead of seconds anyway, in the event someone is saving multiple apps with the upcoming API. The code I removed here got the value in milliseconds if we want to go back to that. https://github.com/LizardByte/Sunshine/compare/7ebe09223c41b16cb8feb421e64f0902e0a91353..21660ea083e217075102ce0bc9130c69bd358983

Using milliseconds probably over complicates this all though... so maybe stick with the time_t and have some logic to ensure that the id isn't already used?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

My fear with using a random number is it's possible for them to repeat. I've seen cases where random functions are not really very random at all.

Here's a potential idea. Use an incrementing counter and store the counter as a separate property in the apps.json. Then just use that value and add 1 to it when assigning a new id?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Given the small chance of collision with this generator vs potential bugs with something like a user-writable counter in a threaded context I would probably lean towards the former?

I could switch to a more precise timestamp with some truncation/casting but this felt a little safer to me

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

How about random then, but check if the id is already used? I feel if we allow it to duplicate, it definitely will happen. I'm used to the SQL auto incrementing style that eliminates the chance of duplication.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/process.cpp
@cgutman

Copy link
Copy Markdown
Collaborator

Any ideas about why app list refreshes don't seem to load properly on the qt client?

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

I think those were to avoid using app ID 0.

@ReenigneArcher

Copy link
Copy Markdown
Member

Can you also replace the ./src_assets/common/assets/box.png with this image? https://discord.com/channels/804382334370578482/1055290596304105572/1059455062243541082

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Yes, I'm noticing the app list on the mac client doesn't seem to refresh at all (even when I add a new app). I'll keep digging, I may have just put it in a bad state

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

I fixed the issue on the qt client, an ID above max signed 32-bit int was failing to parse. This PR should be ready now

@brad-richardson
brad-richardson marked this pull request as ready for review January 2, 2023 20:34
Comment threadsrc/process.cpp
ReenigneArcherand others added 9 commits January 2, 2023 18:20
When an application is saved, the current timestamp in milliseconds is added to as the application id. A timestamp was used instead of a random integer to prevent any chance of repeated values.
@ReenigneArcher
ReenigneArcher merged commit 052297a into LizardByte:nightlyJan 3, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@brad-richardson@cgutman@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Update app id on edit - #670

Merged
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id
Jan 3, 2023
Merged

Update app id on edit#670
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id

Conversation

@brad-richardson

@brad-richardsonbrad-richardson commented Jan 2, 2023

Copy link
Copy Markdown
Contributor

Description

Continuation of #658 to show new app art on edit, tested working on Moonlight QT/iOS.

Screenshot

IMG_628909436696-1
Note that the scaling is wrong for this image on iOS, I'll make a separate change in the moonlight client to fix.

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

@cgutman Any ideas about why app list refreshes don't seem to load properly on the qt client?

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

The commit should fix the iOS scaling issue: brad-richardson/moonlight-ios@33b0307 It's taking a while to install xcode/configure my env so haven't tested it yet.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/confighttp.cpp Outdated
// Add a property named "id" to the inputTree with a value of the current timestamp
// Time is in seconds because some Moonlight clients cannot accept more than a 32-bit integer
// Milliseconds would be a better option
time_t id = time(nullptr);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

time_t is 64-bit on modern systems to avoid the Y2038 issue. We should cast it to make sure it's actually 32-bit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That's my bad... I knew it would just be safe until 2038... but that would also assume the user has their clock set correctly.

I would really like to use milliseconds instead of seconds anyway, in the event someone is saving multiple apps with the upcoming API. The code I removed here got the value in milliseconds if we want to go back to that. https://github.com/LizardByte/Sunshine/compare/7ebe09223c41b16cb8feb421e64f0902e0a91353..21660ea083e217075102ce0bc9130c69bd358983

Using milliseconds probably over complicates this all though... so maybe stick with the time_t and have some logic to ensure that the id isn't already used?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

My fear with using a random number is it's possible for them to repeat. I've seen cases where random functions are not really very random at all.

Here's a potential idea. Use an incrementing counter and store the counter as a separate property in the apps.json. Then just use that value and add 1 to it when assigning a new id?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Given the small chance of collision with this generator vs potential bugs with something like a user-writable counter in a threaded context I would probably lean towards the former?

I could switch to a more precise timestamp with some truncation/casting but this felt a little safer to me

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

How about random then, but check if the id is already used? I feel if we allow it to duplicate, it definitely will happen. I'm used to the SQL auto incrementing style that eliminates the chance of duplication.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/process.cpp
@cgutman

Copy link
Copy Markdown
Collaborator

Any ideas about why app list refreshes don't seem to load properly on the qt client?

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

I think those were to avoid using app ID 0.

@ReenigneArcher

Copy link
Copy Markdown
Member

Can you also replace the ./src_assets/common/assets/box.png with this image? https://discord.com/channels/804382334370578482/1055290596304105572/1059455062243541082

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Yes, I'm noticing the app list on the mac client doesn't seem to refresh at all (even when I add a new app). I'll keep digging, I may have just put it in a bad state

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

I fixed the issue on the qt client, an ID above max signed 32-bit int was failing to parse. This PR should be ready now

@brad-richardson
brad-richardson marked this pull request as ready for review January 2, 2023 20:34
Comment threadsrc/process.cpp
ReenigneArcherand others added 9 commits January 2, 2023 18:20
When an application is saved, the current timestamp in milliseconds is added to as the application id. A timestamp was used instead of a random integer to prevent any chance of repeated values.
@ReenigneArcher
ReenigneArcher merged commit 052297a into LizardByte:nightlyJan 3, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@brad-richardson@cgutman@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Update app id on edit - #670

Merged
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id
Jan 3, 2023
Merged

Update app id on edit#670
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id

Conversation

@brad-richardson

@brad-richardsonbrad-richardson commented Jan 2, 2023

Copy link
Copy Markdown
Contributor

Description

Continuation of #658 to show new app art on edit, tested working on Moonlight QT/iOS.

Screenshot

IMG_628909436696-1
Note that the scaling is wrong for this image on iOS, I'll make a separate change in the moonlight client to fix.

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

@cgutman Any ideas about why app list refreshes don't seem to load properly on the qt client?

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

The commit should fix the iOS scaling issue: brad-richardson/moonlight-ios@33b0307 It's taking a while to install xcode/configure my env so haven't tested it yet.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/confighttp.cpp Outdated
// Add a property named "id" to the inputTree with a value of the current timestamp
// Time is in seconds because some Moonlight clients cannot accept more than a 32-bit integer
// Milliseconds would be a better option
time_t id = time(nullptr);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

time_t is 64-bit on modern systems to avoid the Y2038 issue. We should cast it to make sure it's actually 32-bit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That's my bad... I knew it would just be safe until 2038... but that would also assume the user has their clock set correctly.

I would really like to use milliseconds instead of seconds anyway, in the event someone is saving multiple apps with the upcoming API. The code I removed here got the value in milliseconds if we want to go back to that. https://github.com/LizardByte/Sunshine/compare/7ebe09223c41b16cb8feb421e64f0902e0a91353..21660ea083e217075102ce0bc9130c69bd358983

Using milliseconds probably over complicates this all though... so maybe stick with the time_t and have some logic to ensure that the id isn't already used?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

My fear with using a random number is it's possible for them to repeat. I've seen cases where random functions are not really very random at all.

Here's a potential idea. Use an incrementing counter and store the counter as a separate property in the apps.json. Then just use that value and add 1 to it when assigning a new id?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Given the small chance of collision with this generator vs potential bugs with something like a user-writable counter in a threaded context I would probably lean towards the former?

I could switch to a more precise timestamp with some truncation/casting but this felt a little safer to me

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

How about random then, but check if the id is already used? I feel if we allow it to duplicate, it definitely will happen. I'm used to the SQL auto incrementing style that eliminates the chance of duplication.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/process.cpp
@cgutman

Copy link
Copy Markdown
Collaborator

Any ideas about why app list refreshes don't seem to load properly on the qt client?

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

I think those were to avoid using app ID 0.

@ReenigneArcher

Copy link
Copy Markdown
Member

Can you also replace the ./src_assets/common/assets/box.png with this image? https://discord.com/channels/804382334370578482/1055290596304105572/1059455062243541082

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Yes, I'm noticing the app list on the mac client doesn't seem to refresh at all (even when I add a new app). I'll keep digging, I may have just put it in a bad state

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

I fixed the issue on the qt client, an ID above max signed 32-bit int was failing to parse. This PR should be ready now

@brad-richardson
brad-richardson marked this pull request as ready for review January 2, 2023 20:34
Comment threadsrc/process.cpp
ReenigneArcherand others added 9 commits January 2, 2023 18:20
When an application is saved, the current timestamp in milliseconds is added to as the application id. A timestamp was used instead of a random integer to prevent any chance of repeated values.
@ReenigneArcher
ReenigneArcher merged commit 052297a into LizardByte:nightlyJan 3, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@brad-richardson@cgutman@ReenigneArcher
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Update app id on edit - #670

Merged
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id
Jan 3, 2023
Merged

Update app id on edit#670
ReenigneArcher merged 12 commits into
LizardByte:nightlyfrom
brad-richardson:update-app-id

Conversation

@brad-richardson

@brad-richardsonbrad-richardson commented Jan 2, 2023

Copy link
Copy Markdown
Contributor

Description

Continuation of #658 to show new app art on edit, tested working on Moonlight QT/iOS.

Screenshot

IMG_628909436696-1
Note that the scaling is wrong for this image on iOS, I'll make a separate change in the moonlight client to fix.

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

@cgutman Any ideas about why app list refreshes don't seem to load properly on the qt client?

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

The commit should fix the iOS scaling issue: brad-richardson/moonlight-ios@33b0307 It's taking a while to install xcode/configure my env so haven't tested it yet.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/confighttp.cpp Outdated
// Add a property named "id" to the inputTree with a value of the current timestamp
// Time is in seconds because some Moonlight clients cannot accept more than a 32-bit integer
// Milliseconds would be a better option
time_t id = time(nullptr);

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

time_t is 64-bit on modern systems to avoid the Y2038 issue. We should cast it to make sure it's actually 32-bit.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That's my bad... I knew it would just be safe until 2038... but that would also assume the user has their clock set correctly.

I would really like to use milliseconds instead of seconds anyway, in the event someone is saving multiple apps with the upcoming API. The code I removed here got the value in milliseconds if we want to go back to that. https://github.com/LizardByte/Sunshine/compare/7ebe09223c41b16cb8feb421e64f0902e0a91353..21660ea083e217075102ce0bc9130c69bd358983

Using milliseconds probably over complicates this all though... so maybe stick with the time_t and have some logic to ensure that the id isn't already used?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I've changed this to just be a random number given the upcoming API. I didn't add any guard logic here because it seems unnecessary. Let me know what you think

My fear with using a random number is it's possible for them to repeat. I've seen cases where random functions are not really very random at all.

Here's a potential idea. Use an incrementing counter and store the counter as a separate property in the apps.json. Then just use that value and add 1 to it when assigning a new id?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Given the small chance of collision with this generator vs potential bugs with something like a user-writable counter in a threaded context I would probably lean towards the former?

I could switch to a more precise timestamp with some truncation/casting but this felt a little safer to me

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

How about random then, but check if the id is already used? I feel if we allow it to duplicate, it definitely will happen. I'm used to the SQL auto incrementing style that eliminates the chance of duplication.

Comment threadsrc/nvhttp.cpp Outdated
Comment threadsrc/process.cpp
@cgutman

Copy link
Copy Markdown
Collaborator

Any ideas about why app list refreshes don't seem to load properly on the qt client?

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Also, thoughts on the off by ones I've removed here? I had a couple minor issues around current game state after the changes but I haven't been able to consistently reproduce

I think those were to avoid using app ID 0.

@ReenigneArcher

Copy link
Copy Markdown
Member

Can you also replace the ./src_assets/common/assets/box.png with this image? https://discord.com/channels/804382334370578482/1055290596304105572/1059455062243541082

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

Are you relaunching the client? That should reliably update it (and it should poll the app list every 30 seconds after that).

Yes, I'm noticing the app list on the mac client doesn't seem to refresh at all (even when I add a new app). I'll keep digging, I may have just put it in a bad state

@brad-richardson

Copy link
Copy Markdown
ContributorAuthor

I fixed the issue on the qt client, an ID above max signed 32-bit int was failing to parse. This PR should be ready now

@brad-richardson
brad-richardson marked this pull request as ready for review January 2, 2023 20:34
Comment threadsrc/process.cpp
ReenigneArcherand others added 9 commits January 2, 2023 18:20
When an application is saved, the current timestamp in milliseconds is added to as the application id. A timestamp was used instead of a random integer to prevent any chance of repeated values.
@ReenigneArcher
ReenigneArcher merged commit 052297a into LizardByte:nightlyJan 3, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@brad-richardson@cgutman@ReenigneArcher