mirror
/
photoview
mirror of https://github.com/photoview/photoview.git
1
Fork 0
Code

Try to fix subscriptions not working in docker

This commit is contained in:
viktorstrate 2019-08-10 17:38:43 +02:00
parent d9ba92aaa5
commit 11586209bf
4 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
api/package-lock.json generated
View File

@ -2213,9 +2213,9 @@
"dev": true
},
"core-js": {
"version": "3.1.4",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz",
"integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ=="
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.0.tgz",
"integrity": "sha512-gybgLzmr7SQRSF6UzGYXducx4eE10ONQlyEnQoqiGPbmbn7zLkb73tPfc4YbZN0lvcTQwoLNPjq4RuCaCumGyQ=="
},
"core-js-compat": {
"version": "3.1.4",
@ -2585,15 +2585,15 @@
}
},
"exiftool-vendored": {
"version": "8.19.0",
"resolved": "https://registry.npmjs.org/exiftool-vendored/-/exiftool-vendored-8.19.0.tgz",
"integrity": "sha512-MfZku+Wl7HruSPhs5ba+b9JCf1FhR57fXouvOm/i4JIHZO8Ib9ocEhIONCqixjezHzcceuQNTLyTEAG9Jdr7vw==",
"version": "8.21.0",
"resolved": "https://registry.npmjs.org/exiftool-vendored/-/exiftool-vendored-8.21.0.tgz",
"integrity": "sha512-aAug+t4JHYkqj4kQzu9wUsemWdWxplX+U5SecU3H3IEYqSsZaPDsSKPn00hjEaEFyugqf3NH+lYFJVL+5OK+RQ==",
"requires": {
"batch-cluster": "^5.6.7",
"exiftool-vendored.exe": "11.59.0",
"exiftool-vendored.pl": "11.59.0",
"luxon": "^1.17.2",
"tz-lookup": "^6.1.21"
"tz-lookup": "^6.1.23"
}
},
"exiftool-vendored.exe": {
@ -3880,10 +3880,13 @@
}
},
"hosted-git-info": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
"dev": true
"version": "2.8.2",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz",
"integrity": "sha512-CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==",
"dev": true,
"requires": {
"lru-cache": "^5.1.1"
}
},
"http-errors": {
"version": "1.7.3",
@ -3898,9 +3901,9 @@
}
},
"husky": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/husky/-/husky-3.0.2.tgz",
"integrity": "sha512-WXCtaME2x0o4PJlKY4ap8BzLA+D0zlvefqAvLCPriOOu+x0dpO5uc5tlB7CY6/0SE2EESmoZsj4jW5D09KrJoA==",
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/husky/-/husky-3.0.3.tgz",
"integrity": "sha512-DBBMPSiBYEMx7EVUTRE/ymXJa/lOL+WplcsV/lZu+/HHGt0gzD+5BIz9EJnCrWyUa7hkMuBh7/9OZ04qDkM+Nw==",
"dev": true,
"requires": {
"chalk": "^2.4.2",
@ -3910,7 +3913,7 @@
"is-ci": "^2.0.0",
"opencollective-postinstall": "^2.0.2",
"pkg-dir": "^4.2.0",
"please-upgrade-node": "^3.1.1",
"please-upgrade-node": "^3.2.0",
"read-pkg": "^5.1.1",
"run-node": "^1.0.0",
"slash": "^3.0.0"
@ -3959,6 +3962,15 @@
"find-up": "^4.0.0"
}
},
"please-upgrade-node": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
"integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
"dev": true,
"requires": {
"semver-compare": "^1.0.0"
}
},
"slash": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",

6
api/package.json
View File

@ -23,9 +23,9 @@
"apollo-server": "^2.8.1",
"babel-runtime": "^6.26.0",
"body-parser": "^1.19.0",
"core-js": "^3.1.4",
"core-js": "^3.2.0",
"dotenv": "^8.0.0",
"exiftool-vendored": "^8.19.0",
"exiftool-vendored": "^8.21.0",
"fs-extra": "^8.1.0",
"graphql-tag": "^2.10.1",
"image-size": "^0.7.4",
@ -45,7 +45,7 @@
"@babel/cli": "^7.5.5",
"@babel/core": "^7.5.5",
"@babel/preset-env": "^7.5.5",
"husky": "^3.0.2",
"husky": "^3.0.3",
"lint-staged": "^9.2.1",
"nodemon": "^1.18.11",
"prettier": "^1.18.2"

4
api/src/index.js
View File

@ -133,7 +133,7 @@ const server = new ApolloServer({
},
})
server.applyMiddleware({ app, graphPath })
server.applyMiddleware({ app, path: graphPath })
import loadImageRoutes from './routes/images'
@ -142,7 +142,7 @@ loadImageRoutes({ app, driver, scanner })
const httpServer = http.createServer(app)
server.installSubscriptionHandlers(httpServer)
httpServer.listen({ port: endpointUrl.port, graphPath }, () => {
httpServer.listen({ port: endpointUrl.port, path: graphPath }, () => {
console.log(
`🚀 GraphQL endpoint ready at ${new URL(server.graphqlPath, endpointUrl)}`
)

2
api/src/scanner/Scanner.js
View File

@ -30,6 +30,8 @@ class PhotoScanner {
}
this.broadcastProgress = _.debounce(() => {
if (imagesToProgress == 0) return
console.log(
`Progress: ${(this.finishedImages / this.imagesToProgress) * 100}`
)