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

@uppy/companion: Unify redis initialization #4597

Merged
merged 4 commits into from
Jul 31, 2023

Conversation

dschmidt
Copy link
Contributor

@dschmidt dschmidt commented Jul 20, 2023

This PR achieves a few goals at once:

  • update connect-redis to get rid of:
    • yarn patch
    • @types/connect-redis dependency
    • legacyMode of node-redis
  • make it possible to pass in redisOptions as json via env var COMPANION_REDIS_OPTIONS
  • use node-redis client singleton in redis-emitter, so redisUrl and redisOptions are always used consistently
  • moves all checks for availability of redisUrl or redisOptions to the singleton factory to reduce duplication and avoid possible mismatches

This prepares switching to ioredis as proposed in #4571, which is probably much more controversial than these changes.
Even if you don't want to switch to ioredis in the foreseeable future, landing this upstream would help me keep my ioredis patch as minimal as possible.

See also [email protected] release notes for a migration guide: https://github.com/tj/connect-redis/releases/tag/v7.0.0

@socket-security
Copy link

Updated and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Packages Version New capabilities Transitives Size Publisher
connect-redis 6.1.3...7.1.0 None +0/-0 43.7 kB wavded

🚮 Removed packages: @types/[email protected]

@arturi arturi requested a review from mifi July 21, 2023 14:57
Copy link
Contributor

@mifi mifi left a comment

Choose a reason for hiding this comment

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

nice stuff! wdyt about my comments?

packages/@uppy/companion/src/standalone/helper.js Outdated Show resolved Hide resolved
packages/@uppy/companion/src/standalone/helper.js Outdated Show resolved Hide resolved
@dschmidt dschmidt force-pushed the unify-redis-usage branch from 2968a68 to e649874 Compare July 31, 2023 12:29
@dschmidt
Copy link
Contributor Author

nice stuff! wdyt about my comments?

good catches, fixed!

@dschmidt dschmidt force-pushed the unify-redis-usage branch from f2705a2 to 58fb61d Compare July 31, 2023 12:33
@mifi mifi merged commit 22d9381 into transloadit:main Jul 31, 2023
@dschmidt dschmidt deleted the unify-redis-usage branch July 31, 2023 14:37
@dschmidt
Copy link
Contributor Author

Hooray! 🎉

github-actions bot added a commit that referenced this pull request Aug 15, 2023
| Package                   | Version | Package                   | Version |
| ------------------------- | ------- | ------------------------- | ------- |
| @uppy/audio               |   1.1.2 | @uppy/locales             |   3.3.0 |
| @uppy/aws-s3              |   3.2.2 | @uppy/onedrive            |   3.1.3 |
| @uppy/aws-s3-multipart    |   3.5.3 | @uppy/progress-bar        |   3.0.3 |
| @uppy/box                 |   2.1.3 | @uppy/provider-views      |   3.5.0 |
| @uppy/companion           |   4.8.0 | @uppy/redux-dev-tools     |   3.0.3 |
| @uppy/companion-client    |   3.3.0 | @uppy/screen-capture      |   3.1.2 |
| @uppy/core                |   3.4.0 | @uppy/status-bar          |   3.2.4 |
| @uppy/dashboard           |   3.5.1 | @uppy/thumbnail-generator |   3.0.4 |
| @uppy/drag-drop           |   3.0.3 | @uppy/transloadit         |   3.2.1 |
| @uppy/dropbox             |   3.1.3 | @uppy/tus                 |   3.1.3 |
| @uppy/facebook            |   3.1.2 | @uppy/unsplash            |   3.2.2 |
| @uppy/file-input          |   3.0.3 | @uppy/url                 |   3.3.3 |
| @uppy/google-drive        |   3.2.1 | @uppy/webcam              |   3.3.2 |
| @uppy/image-editor        |   2.1.3 | @uppy/xhr-upload          |   3.3.2 |
| @uppy/informer            |   3.0.3 | @uppy/zoom                |   2.1.2 |
| @uppy/instagram           |   3.1.2 | uppy                      |  3.14.0 |

- meta: Readme improvements (Artur Paikin / #4622)
- @uppy/companion: Fix typos and add env vars to .env.example (Dominik Schmidt / #4624)
- @uppy/aws-s3-multipart: pass the `uploadURL` back to the caller (Antoine du Hamel / #4614)
- meta: update to node-18.17.0-alpine,  (odselsevier / #4617)
- @uppy/aws-s3,@uppy/aws-s3-multipart: update types (Antoine du Hamel / #4611)
- @uppy/aws-s3-multipart,@uppy/aws-s3,@uppy/companion,@uppy/transloadit,@uppy/xhr-upload: use uppercase HTTP method names (Antoine du Hamel / #4612)
- meta: e2e: fix race condition in transloadit test (Antoine du Hamel / #4616)
- @uppy/aws-s3,@uppy/aws-s3-multipart: update types (bdirito / #4576)
- @uppy/core: allow duplicate files with onBeforeFileAdded (Merlijn Vos / #4594)
- @uppy/companion: make CSRF protection helpers available to providers (Dominik Schmidt / #4554)
- @uppy/companion: fix Redis key default TTL (Subha Sarkar / #4607)
- @uppy/companion: Fix Uploader.js metadata normalisation (Subha Sarkar / #4608)
- @uppy/companion-client,@uppy/provider-views: make authentication optional (Dominik Schmidt / #4556)
- @uppy/provider-views: fix ProviderView error on empty plugin.icon (Dominik Schmidt / #4553)
- @uppy/aws-s3,@uppy/tus,@uppy/xhr-upload:  Invoke headers function for remote uploads (Dominik Schmidt / #4596)
- @uppy/companion: Unify redis initialization (Dominik Schmidt / #4597)
- meta: lock node-js version on ci (Mikael Finstad / #4606)
- @uppy/companion: allow dynamic S3 bucket (rmoura-92 / #4579)
- @uppy/status-bar: e2e: add test for retrying and pausing uploads (Antoine du Hamel / #3599)
- meta: e2e: remove too short timeout (Antoine du Hamel / #4602)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants