mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #5459 from electron/soft-warning

Browse source 
Turn exception in protocol.registerStandardSchemes into warning warning
This commit is contained in:
Cheng Zhao 2016-05-10 11:11:00 +09:00
commit 61ec3acde9
3 changed files with 46 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

56
docs/api/protocol.md
View file

@ -6,22 +6,21 @@ An example of implementing a protocol that has the same effect as the
`file://` protocol: `file://` protocol:
```javascript ```javascript
const electron = require('electron'); const {app, protocol} = require('electron')
const { app, protocol } = electron; const path = require('path')
const path = require('path');
app.on('ready', function() { app.on('ready', function () {
protocol.registerFileProtocol('atom', function(request, callback) { protocol.registerFileProtocol('atom', function (request, callback) {
const url = request.url.substr(7); const url = request.url.substr(7)
callback({path: path.normalize(__dirname + '/' + url)}); callback({path: path.normalize(__dirname + '/' + url)})
}, function (error) { }, function (error) {
if (error) if (error)
console.error('Failed to register protocol') console.error('Failed to register protocol')
}); })
}); })
``` ```
**Note:** All methods unless specified can only be used after the `ready` **Note:** All methods unless specified can only be used after the `ready` event
event in the `app` module is emitted. of the `app` module gets emitted.
## Methods ## Methods
@ -31,13 +30,36 @@ The `protocol` module has the following methods:
* `schemes` Array - Custom schemes to be registered as standard schemes. * `schemes` Array - Custom schemes to be registered as standard schemes.
A standard `scheme` adheres to what RFC 3986 calls A standard scheme adheres to what RFC 3986 calls [generic URI
[generic URI syntax](https://tools.ietf.org/html/rfc3986#section-3). This syntax](https://tools.ietf.org/html/rfc3986#section-3). For example `http` and
includes `file:`, `filesystem:`, `http` etc. Registering a scheme as standard, will `https` are standard schemes, while `file` is not.
allow relative and absolute resources to be resolved correctly when served.
**Note:** This method can only be used before the `ready` event in the Registering a scheme as standard, will allow relative and absolute resources to
`app` module is emitted. be resolved correctly when served. Otherwise the scheme will behave like the
`file` protocol, but without the ability to resolve relative URLs.
For example when you load following page with custom protocol without
registering it as standard scheme, the image will not be loaded because
non-standard schemes can not recognize relative URLs:
```html
<body>
<img src='test.png'>
</body>
```
So if you want to register a custom protocol to replace the `http` protocol, you
have to register it as standard scheme:
```javascript
protocol.registerStandardSchemes(['atom'])
app.on('ready', function () {
protocol.registerHttpProtocol('atom', ...)
})
```
**Note:** This method can only be used before the `ready` event of the `app`
module gets emitted.
### `protocol.registerServiceWorkerSchemes(schemes)` ### `protocol.registerServiceWorkerSchemes(schemes)`

31
lib/browser/api/protocol.js
View file

@ -1,39 +1,16 @@
const app = require('electron').app const {app} = require('electron')
const {createProtocolObject, registerStandardSchemes} = process.atomBinding('protocol') const {createProtocolObject, registerStandardSchemes} = process.atomBinding('protocol')
let protocol = null
// Warn about removed APIs.
var logAndThrow = function (callback, message) {
console.error(message)
if (callback) {
return callback(new Error(message))
} else {
throw new Error(message)
}
}
exports.registerStandardSchemes = function (schemes) { exports.registerStandardSchemes = function (schemes) {
if (app.isReady()) { if (app.isReady()) {
throw new Error('protocol.registerStandardSchemes should be called before app is ready') console.warn('protocol.registerStandardSchemes should be called before app is ready')
return
} }
registerStandardSchemes(schemes) registerStandardSchemes(schemes)
} }
app.once('ready', function () { app.once('ready', function () {
protocol = createProtocolObject() let protocol = createProtocolObject()
// Be compatible with old APIs.
protocol.registerProtocol = function (scheme, handler, callback) {
return logAndThrow(callback, 'registerProtocol API has been replaced by the register[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.')
}
protocol.isHandledProtocol = function (scheme, callback) {
return logAndThrow(callback, 'isHandledProtocol API has been replaced by isProtocolHandled.')
}
protocol.interceptProtocol = function (scheme, handler, callback) {
return logAndThrow(callback, 'interceptProtocol API has been replaced by the intercept[File/Http/Buffer/String]Protocol API family, please switch to the new APIs.')
}
for (let method in protocol) { for (let method in protocol) {
exports[method] = protocol[method].bind(protocol) exports[method] = protocol[method].bind(protocol)
} }

6
spec/api-protocol-spec.js
View file

@ -841,12 +841,6 @@ describe('protocol module', function () {
}) })
}) })
it('throws when called after ready event', function () {
assert.throws(function () {
protocol.registerStandardSchemes(['some-scheme'])
}, 'protocol.registerStandardSchemes should be called before app is ready')
})
it('resolves relative resources', function (done) { it('resolves relative resources', function (done) {
var handler = function (request, callback) { var handler = function (request, callback) {
if (request.url === imageURL) { if (request.url === imageURL) {