mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
aa1ba9cb24
* Replace several ActionCable.* references with finer-grained imports
This reduces the number of circular dependencies among the module
imports from 4:
```
(!) Circular dependency: app/javascript/action_cable/index.js -> app/javascript/action_cable/connection.js -> app/javascript/action_cable/index.js
(!) Circular dependency: app/javascript/action_cable/index.js -> app/javascript/action_cable/connection_monitor.js -> app/javascript/action_cable/index.js
(!) Circular dependency: app/javascript/action_cable/index.js -> app/javascript/action_cable/consumer.js -> app/javascript/action_cable/index.js
(!) Circular dependency: app/javascript/action_cable/index.js -> app/javascript/action_cable/subscriptions.js -> app/javascript/action_cable/index.js
```
to 2:
```
(!) Circular dependency: app/javascript/action_cable/index.js -> app/javascript/action_cable/connection.js -> app/javascript/action_cable/index.js
(!) Circular dependency: app/javascript/action_cable/index.js -> app/javascript/action_cable/connection.js -> app/javascript/action_cable/connection_monitor.js -> app/javascript/action_cable/index.js
```
* Remove tests that only test javascript object property assignment
These tests really only assert that you can assign a property to
the ActionCable global object. That's true for pretty much any object
in javascript (it would only be false if the object has been frozen, or
has explicitly set some properties to be nonconfigurable).
* Refactor ActionCable to provide individual named exports
By providing individual named exports rather than a default export which
is an object with all of those properties, we enable applications to
only import the functions they need: any unused functions will be
removed via tree shaking.
Additionally, this restructuring removes the remaining circular
dependencies by extracting the separate adapters and logger modules, so
there are now no warnings when compiling the ActionCable bundle.
Note: This produces two small breaking API changes:
- The `ActionCable.WebSocket` getter and setter would be moved to
`ActionCable.adapters.WebSocket`. If a user is currently configuring
this, when upgrading they'd need to either add a delegated
getter/setter themselves, or change it like this:
```diff
- ActionCable.WebSocket = MyWebSocket
+ ActionCable.adapters.WebSocket = MyWebSocket
```
Applications which don't change the WebSocket adapter would not need
any changes for this when upgrading.
- Similarly, the `ActionCable.logger` getter and setter would be moved
to `ActionCable.adapters.logger`. If a user is currently configuring
this, when upgrading they'd need to either add a delegated
getter/setter themselves, or change it like this:
```diff
- ActionCable.logger = myLogger
+ ActionCable.adapters.logger = myLogger
```
Applications which don't change the logger would not need any changes
for this when upgrading.
These two aspects of the public API have to change because there's no
way to export a property setter for `WebSocket` (or `logger`) such that
this:
```js
import ActionCable from "actioncable"
ActionCable.WebSocket = MyWebSocket
```
would actually update `adapters.WebSocket`. (We can only offer that if
we have two separate source files like if `index.js` uses
`import * as ActionCable from "./action_cable" and then exports a
wrapper which has delegated getters and setters for those properties.)
This API change is very minor - it should be easy for applications to
add the `adapters.` prefix in their assignments or to patch in delegated
setters. And especially because most applications in the wild are not
ever changing the default value of `ActionCable.WebSocket` or
`ActionCable.logger` (because the default values are perfect), this API
breakage is worth the tree-shaking benefits we gain.
* Include source code in published actioncable npm package
This allows actioncable users to ship smaller javascript bundles to
visitors using modern browsers, as demonstrated in this repository:
https://github.com/rmacklin/actioncable-es2015-build-example
In that example, the bundle shrinks by 2.8K (25.2%) when you simply
change the actioncable import to point to the untranspiled src.
If you go a step further, like this:
```
diff --git a/app/scripts/main.js b/app/scripts/main.js
index 17bc031..1a2b2e0 100644
--- a/app/scripts/main.js
+++ b/app/scripts/main.js
@@ -1,6 +1,6 @@
-import ActionCable from 'actioncable';
+import * as ActionCable from 'actioncable';
let cable = ActionCable.createConsumer('wss://cable.example.com');
cable.subscriptions.create('AppearanceChannel', {
```
then the bundle shrinks by 3.6K (31.7%)!
In addition to allowing smaller bundles for those who ship untranspiled
code to modern browsers, including the source code in the published
package can be useful in other ways:
1. Users can import individual modules rather than the whole library
2. As a result of (1), users can also monkey patch parts of actioncable
by importing the relevant module, modifying the exported object, and
then importing the rest of actioncable (which would then use the
patched object).
Note: This is the same enhancement that we made to activestorage in
c0368ad090
* Remove unused commonjs & resolve plugins from ActionCable rollup config
These were added when we copied the rollup config from ActiveStorage,
but ActionCable does not have any commonjs dependencies (it doesn't have
any external dependencies at all), so these plugins are unnecessary here
* Change ActionCable.startDebugging() -> ActionCable.logger.enabled=true
and ActionCable.stopDebugging() -> ActionCable.logger.enabled=false
This API is simpler and more clearly describes what it does
* Change Travis configuration to run yarn install at the root for ActionCable builds
This is necessary now that the repository is using Yarn Workspaces
126 lines
3.4 KiB
JavaScript
126 lines
3.4 KiB
JavaScript
import logger from "./logger"
|
|
|
|
// Responsible for ensuring the cable connection is in good health by validating the heartbeat pings sent from the server, and attempting
|
|
// revival reconnections if things go astray. Internal class, not intended for direct user manipulation.
|
|
|
|
const now = () => new Date().getTime()
|
|
|
|
const secondsSince = time => (now() - time) / 1000
|
|
|
|
const clamp = (number, min, max) => Math.max(min, Math.min(max, number))
|
|
|
|
class ConnectionMonitor {
|
|
constructor(connection) {
|
|
this.visibilityDidChange = this.visibilityDidChange.bind(this)
|
|
this.connection = connection
|
|
this.reconnectAttempts = 0
|
|
}
|
|
|
|
start() {
|
|
if (!this.isRunning()) {
|
|
this.startedAt = now()
|
|
delete this.stoppedAt
|
|
this.startPolling()
|
|
document.addEventListener("visibilitychange", this.visibilityDidChange)
|
|
logger.log(`ConnectionMonitor started. pollInterval = ${this.getPollInterval()} ms`)
|
|
}
|
|
}
|
|
|
|
stop() {
|
|
if (this.isRunning()) {
|
|
this.stoppedAt = now()
|
|
this.stopPolling()
|
|
document.removeEventListener("visibilitychange", this.visibilityDidChange)
|
|
logger.log("ConnectionMonitor stopped")
|
|
}
|
|
}
|
|
|
|
isRunning() {
|
|
return this.startedAt && !this.stoppedAt
|
|
}
|
|
|
|
recordPing() {
|
|
this.pingedAt = now()
|
|
}
|
|
|
|
recordConnect() {
|
|
this.reconnectAttempts = 0
|
|
this.recordPing()
|
|
delete this.disconnectedAt
|
|
logger.log("ConnectionMonitor recorded connect")
|
|
}
|
|
|
|
recordDisconnect() {
|
|
this.disconnectedAt = now()
|
|
logger.log("ConnectionMonitor recorded disconnect")
|
|
}
|
|
|
|
// Private
|
|
|
|
startPolling() {
|
|
this.stopPolling()
|
|
this.poll()
|
|
}
|
|
|
|
stopPolling() {
|
|
clearTimeout(this.pollTimeout)
|
|
}
|
|
|
|
poll() {
|
|
this.pollTimeout = setTimeout(() => {
|
|
this.reconnectIfStale()
|
|
this.poll()
|
|
}
|
|
, this.getPollInterval())
|
|
}
|
|
|
|
getPollInterval() {
|
|
const {min, max, multiplier} = this.constructor.pollInterval
|
|
const interval = multiplier * Math.log(this.reconnectAttempts + 1)
|
|
return Math.round(clamp(interval, min, max) * 1000)
|
|
}
|
|
|
|
reconnectIfStale() {
|
|
if (this.connectionIsStale()) {
|
|
logger.log(`ConnectionMonitor detected stale connection. reconnectAttempts = ${this.reconnectAttempts}, pollInterval = ${this.getPollInterval()} ms, time disconnected = ${secondsSince(this.disconnectedAt)} s, stale threshold = ${this.constructor.staleThreshold} s`)
|
|
this.reconnectAttempts++
|
|
if (this.disconnectedRecently()) {
|
|
logger.log("ConnectionMonitor skipping reopening recent disconnect")
|
|
} else {
|
|
logger.log("ConnectionMonitor reopening")
|
|
this.connection.reopen()
|
|
}
|
|
}
|
|
}
|
|
|
|
connectionIsStale() {
|
|
return secondsSince(this.pingedAt ? this.pingedAt : this.startedAt) > this.constructor.staleThreshold
|
|
}
|
|
|
|
disconnectedRecently() {
|
|
return this.disconnectedAt && (secondsSince(this.disconnectedAt) < this.constructor.staleThreshold)
|
|
}
|
|
|
|
visibilityDidChange() {
|
|
if (document.visibilityState === "visible") {
|
|
setTimeout(() => {
|
|
if (this.connectionIsStale() || !this.connection.isOpen()) {
|
|
logger.log(`ConnectionMonitor reopening stale connection on visibilitychange. visbilityState = ${document.visibilityState}`)
|
|
this.connection.reopen()
|
|
}
|
|
}
|
|
, 200)
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
ConnectionMonitor.pollInterval = {
|
|
min: 3,
|
|
max: 30,
|
|
multiplier: 5
|
|
}
|
|
|
|
ConnectionMonitor.staleThreshold = 6 // Server::Connections::BEAT_INTERVAL * 2 (missed two pings)
|
|
|
|
export default ConnectionMonitor
|