Skip to content
This repository was archived by the owner on Aug 24, 2021. It is now read-only.

Commit 240ed0b

Browse files
Merge pull request #14 from multiformats/webworker
feat: add support for webworkers
2 parents 521fe18 + 2f30f71 commit 240ed0b

File tree

3 files changed

+24
-83
lines changed

3 files changed

+24
-83
lines changed

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"./src/crypto-sha1-2.js": "./src/crypto-sha1-2-browser.js"
88
},
99
"scripts": {
10-
"test": "aegir-test",
11-
"test:browser": "aegir-test browser",
10+
"test": "aegir-test --webworker",
11+
"test:browser": "aegir-test browser --webworker",
1212
"test:node": "aegir-test node",
1313
"lint": "aegir-lint",
1414
"docs": "aegir-docs",
15-
"release": "aegir-release --docs",
16-
"release-minor": "aegir-release minor --docs",
17-
"release-major": "aegir-release major --docs",
15+
"release": "aegir-release --docs --webworker",
16+
"release-minor": "aegir-release minor --docs --webworker",
17+
"release-major": "aegir-release major --docs --webworker",
1818
"build": "aegir-build",
1919
"coverage": "aegir-coverage",
2020
"coverage-publish": "aegir-coverage publish",
@@ -38,13 +38,13 @@
3838
},
3939
"dependencies": {
4040
"async": "^2.1.4",
41-
"js-sha3": "^0.5.5",
42-
"multihashes": "^0.3.0",
41+
"js-sha3": "^0.5.7",
42+
"multihashes": "^0.3.2",
4343
"nodeify": "^1.0.0"
4444
},
4545
"devDependencies": {
46-
"aegir": "^9.3.0",
47-
"benchmark": "^2.1.2",
46+
"aegir": "^9.4.0",
47+
"benchmark": "^2.1.3",
4848
"chai": "^3.5.0",
4949
"pre-commit": "^1.2.2"
5050
},

src/crypto-browser.js

Lines changed: 0 additions & 68 deletions
This file was deleted.

src/crypto-sha1-2-browser.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
1+
/* global self */
12
'use strict'
23

34
const nodeify = require('nodeify')
45

56
const webCrypto = getWebCrypto()
67

78
function getWebCrypto () {
9+
let globalContext
10+
811
if (typeof window !== 'undefined') {
9-
if (window.crypto) {
10-
return window.crypto.subtle || window.crypto.webkitSubtle
11-
}
12+
globalContext = window
13+
} else if (typeof self !== 'undefined') {
14+
globalContext = self
15+
} else {
16+
return
17+
}
1218

13-
if (window.msCrypto) {
14-
return window.msCrypto.subtle
15-
}
19+
if (globalContext.crypto) {
20+
return globalContext.crypto.subtle || globalContext.crypto.webkitSubtle
21+
}
22+
23+
if (globalContext.msCrypto) {
24+
return globalContext.msCrypto.subtle
1625
}
1726
}
1827

0 commit comments

Comments
 (0)