فهرست منبع

Merge pull request #33 from sharelatex/csh-ho-docker-issue-1338-bulk-upgrade

Services bulk upgrade - real-time
Christopher Hoskin 7 سال پیش
والد
کامیت
ab81a16657

+ 1 - 0
services/real-time/.gitignore

@@ -4,3 +4,4 @@ app.js
 app/js
 test/unit/js
 test/acceptance/js
+app.js.map

+ 1 - 1
services/real-time/.nvmrc

@@ -1 +1 @@
-6.9.5
+6.15.1

+ 3 - 3
services/real-time/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:6.9.5 as app
+FROM node:6.15.1 as app
 
 WORKDIR /app
 
@@ -12,11 +12,11 @@ COPY . /app
 
 RUN npm run compile:all
 
-FROM node:6.9.5
+FROM node:6.15.1
 
 COPY --from=app /app /app
 
 WORKDIR /app
 USER node
 
-CMD ["node","app.js"]
+CMD ["node", "--expose-gc", "app.js"]

+ 1 - 1
services/real-time/Makefile

@@ -1,7 +1,7 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.1.9
+# Version: 1.1.10
 
 BUILD_NUMBER ?= local
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)

+ 1 - 0
services/real-time/app.coffee

@@ -25,6 +25,7 @@ DrainManager = require("./app/js/DrainManager")
 
 # Set up socket.io server
 app = express()
+Metrics.injectMetricsRoute(app)
 server = require('http').createServer(app)
 io = require('socket.io').listen(server)
 

+ 2 - 2
services/real-time/buildscript.txt

@@ -1,6 +1,6 @@
---script-version=1.1.9
+--script-version=1.1.10
 real-time
---node-version=6.9.5
+--node-version=6.15.1
 --acceptance-creds=None
 --language=coffeescript
 --dependencies=mongo,redis

+ 1 - 1
services/real-time/docker-compose.ci.yml

@@ -1,7 +1,7 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.1.9
+# Version: 1.1.10
 
 version: "2"
 

+ 1 - 1
services/real-time/docker-compose.yml

@@ -1,7 +1,7 @@
 # This file was auto-generated, do not edit it directly.
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
-# Version: 1.1.9
+# Version: 1.1.10
 
 version: "2"
 

+ 242 - 189
services/real-time/npm-shrinkwrap.json

@@ -3,24 +3,41 @@
   "version": "0.1.4",
   "dependencies": {
     "@google-cloud/common": {
-      "version": "0.23.0",
-      "from": "@google-cloud/common@>=0.23.0 <0.24.0",
-      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.23.0.tgz"
+      "version": "0.27.0",
+      "from": "@google-cloud/common@>=0.27.0 <0.28.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.27.0.tgz"
     },
     "@google-cloud/debug-agent": {
-      "version": "3.0.0",
+      "version": "3.0.1",
       "from": "@google-cloud/debug-agent@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/@google-cloud/debug-agent/-/debug-agent-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/@google-cloud/debug-agent/-/debug-agent-3.0.1.tgz",
       "dependencies": {
         "coffeescript": {
           "version": "2.3.2",
           "from": "coffeescript@>=2.0.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.3.2.tgz"
+        }
+      }
+    },
+    "@google-cloud/profiler": {
+      "version": "0.2.3",
+      "from": "@google-cloud/profiler@>=0.2.3 <0.3.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/profiler/-/profiler-0.2.3.tgz",
+      "dependencies": {
+        "@google-cloud/common": {
+          "version": "0.26.2",
+          "from": "@google-cloud/common@>=0.26.0 <0.27.0",
+          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.26.2.tgz"
         },
-        "lodash": {
-          "version": "4.17.11",
-          "from": "lodash@>=4.12.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz"
+        "nan": {
+          "version": "2.12.1",
+          "from": "nan@>=2.11.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz"
+        },
+        "through2": {
+          "version": "3.0.0",
+          "from": "through2@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz"
         }
       }
     },
@@ -35,36 +52,14 @@
       "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-0.3.1.tgz"
     },
     "@google-cloud/trace-agent": {
-      "version": "3.4.0",
+      "version": "3.5.0",
       "from": "@google-cloud/trace-agent@>=3.2.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-3.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/@google-cloud/trace-agent/-/trace-agent-3.5.0.tgz",
       "dependencies": {
         "@google-cloud/common": {
-          "version": "0.27.0",
-          "from": "@google-cloud/common@>=0.27.0 <0.28.0",
-          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.27.0.tgz"
-        },
-        "gcp-metadata": {
-          "version": "0.9.0",
-          "from": "gcp-metadata@>=0.9.0 <0.10.0",
-          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.9.0.tgz"
-        },
-        "google-auth-library": {
-          "version": "2.0.1",
-          "from": "google-auth-library@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-2.0.1.tgz",
-          "dependencies": {
-            "gcp-metadata": {
-              "version": "0.7.0",
-              "from": "gcp-metadata@^0.7.0",
-              "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.7.0.tgz"
-            }
-          }
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "from": "lru-cache@^4.1.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"
+          "version": "0.28.0",
+          "from": "@google-cloud/common@>=0.28.0 <0.29.0",
+          "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.28.0.tgz"
         },
         "uuid": {
           "version": "3.3.2",
@@ -73,16 +68,93 @@
         }
       }
     },
+    "@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "from": "@protobufjs/aspromise@>=1.1.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz"
+    },
+    "@protobufjs/base64": {
+      "version": "1.1.2",
+      "from": "@protobufjs/base64@>=1.1.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz"
+    },
+    "@protobufjs/codegen": {
+      "version": "2.0.4",
+      "from": "@protobufjs/codegen@>=2.0.4 <3.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz"
+    },
+    "@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "from": "@protobufjs/eventemitter@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz"
+    },
+    "@protobufjs/fetch": {
+      "version": "1.1.0",
+      "from": "@protobufjs/fetch@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz"
+    },
+    "@protobufjs/float": {
+      "version": "1.0.2",
+      "from": "@protobufjs/float@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz"
+    },
+    "@protobufjs/inquire": {
+      "version": "1.1.0",
+      "from": "@protobufjs/inquire@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz"
+    },
+    "@protobufjs/path": {
+      "version": "1.1.2",
+      "from": "@protobufjs/path@>=1.1.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz"
+    },
+    "@protobufjs/pool": {
+      "version": "1.1.0",
+      "from": "@protobufjs/pool@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz"
+    },
+    "@protobufjs/utf8": {
+      "version": "1.1.0",
+      "from": "@protobufjs/utf8@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz"
+    },
+    "@sindresorhus/is": {
+      "version": "0.13.0",
+      "from": "@sindresorhus/is@>=0.13.0 <0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.13.0.tgz"
+    },
+    "@sinonjs/commons": {
+      "version": "1.3.0",
+      "from": "@sinonjs/commons@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.3.0.tgz",
+      "dependencies": {
+        "type-detect": {
+          "version": "4.0.8",
+          "from": "type-detect@4.0.8",
+          "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"
+        }
+      }
+    },
     "@sinonjs/formatio": {
-      "version": "2.0.0",
-      "from": "@sinonjs/formatio@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz"
+      "version": "3.1.0",
+      "from": "@sinonjs/formatio@>=3.1.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.1.0.tgz"
+    },
+    "@sinonjs/samsam": {
+      "version": "3.0.2",
+      "from": "@sinonjs/samsam@>=3.0.2 <4.0.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.0.2.tgz"
     },
     "@types/caseless": {
       "version": "0.12.1",
       "from": "@types/caseless@*",
       "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.1.tgz"
     },
+    "@types/console-log-level": {
+      "version": "1.4.0",
+      "from": "@types/console-log-level@>=1.4.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/console-log-level/-/console-log-level-1.4.0.tgz"
+    },
     "@types/duplexify": {
       "version": "3.6.0",
       "from": "@types/duplexify@>=3.5.0 <4.0.0",
@@ -93,16 +165,26 @@
       "from": "@types/form-data@*",
       "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz"
     },
+    "@types/long": {
+      "version": "4.0.0",
+      "from": "@types/long@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.0.tgz"
+    },
     "@types/node": {
-      "version": "10.12.12",
+      "version": "10.12.18",
       "from": "@types/node@*",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.12.tgz"
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz"
     },
     "@types/request": {
       "version": "2.48.1",
       "from": "@types/request@>=2.47.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.1.tgz"
     },
+    "@types/semver": {
+      "version": "5.5.0",
+      "from": "@types/semver@>=5.5.0 <6.0.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz"
+    },
     "@types/tough-cookie": {
       "version": "2.3.4",
       "from": "@types/tough-cookie@*",
@@ -160,6 +242,11 @@
       "from": "array-flatten@1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
     },
+    "array-from": {
+      "version": "2.1.1",
+      "from": "array-from@>=2.1.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz"
+    },
     "arrify": {
       "version": "1.0.1",
       "from": "arrify@>=1.0.1 <2.0.0",
@@ -230,6 +317,11 @@
       "from": "bignumber.js@>=7.0.0 <8.0.0",
       "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-7.2.1.tgz"
     },
+    "bindings": {
+      "version": "1.3.1",
+      "from": "bindings@>=1.2.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.1.tgz"
+    },
     "bintrees": {
       "version": "1.0.1",
       "from": "bintrees@1.0.1",
@@ -426,10 +518,10 @@
       "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
       "dev": true
     },
-    "define-properties": {
-      "version": "1.1.3",
-      "from": "define-properties@>=1.1.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"
+    "delay": {
+      "version": "4.1.0",
+      "from": "delay@>=4.0.1 <5.0.0",
+      "resolved": "https://registry.npmjs.org/delay/-/delay-4.1.0.tgz"
     },
     "delayed-stream": {
       "version": "0.0.5",
@@ -499,16 +591,6 @@
       "from": "ent@>=2.2.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"
     },
-    "es-abstract": {
-      "version": "1.12.0",
-      "from": "es-abstract@>=1.5.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz"
-    },
-    "es-to-primitive": {
-      "version": "1.2.0",
-      "from": "es-to-primitive@>=1.1.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz"
-    },
     "es6-promise": {
       "version": "4.2.5",
       "from": "es6-promise@>=4.0.3 <5.0.0",
@@ -660,9 +742,9 @@
       "resolved": "https://registry.npmjs.org/flexbuffer/-/flexbuffer-0.0.6.tgz"
     },
     "follow-redirects": {
-      "version": "1.5.10",
+      "version": "1.6.1",
       "from": "follow-redirects@>=1.3.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.6.1.tgz",
       "dependencies": {
         "debug": {
           "version": "3.1.0",
@@ -718,15 +800,15 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "dev": true
     },
-    "function-bind": {
-      "version": "1.1.1",
-      "from": "function-bind@>=1.1.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
+    "gaxios": {
+      "version": "1.0.4",
+      "from": "gaxios@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-1.0.4.tgz"
     },
     "gcp-metadata": {
-      "version": "0.7.0",
-      "from": "gcp-metadata@>=0.7.0 <0.8.0",
-      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.7.0.tgz"
+      "version": "0.9.3",
+      "from": "gcp-metadata@>=0.9.0 <0.10.0",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.9.3.tgz"
     },
     "get-func-name": {
       "version": "2.0.0",
@@ -744,33 +826,26 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
     },
     "google-auth-library": {
-      "version": "1.6.1",
-      "from": "google-auth-library@>=1.6.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-1.6.1.tgz",
+      "version": "2.0.2",
+      "from": "google-auth-library@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-2.0.2.tgz",
       "dependencies": {
         "gcp-metadata": {
-          "version": "0.6.3",
-          "from": "gcp-metadata@>=0.6.3 <0.7.0",
-          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.6.3.tgz"
+          "version": "0.7.0",
+          "from": "gcp-metadata@>=0.7.0 <0.8.0",
+          "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.7.0.tgz"
         },
         "lru-cache": {
-          "version": "4.1.5",
-          "from": "lru-cache@>=4.1.3 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"
+          "version": "5.1.1",
+          "from": "lru-cache@>=5.0.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"
         }
       }
     },
     "google-p12-pem": {
-      "version": "1.0.2",
+      "version": "1.0.3",
       "from": "google-p12-pem@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.2.tgz",
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "from": "pify@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-1.0.3.tgz"
     },
     "graceful-fs": {
       "version": "1.2.3",
@@ -970,11 +1045,6 @@
         }
       }
     },
-    "has": {
-      "version": "1.0.3",
-      "from": "has@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
-    },
     "has-ansi": {
       "version": "0.1.0",
       "from": "has-ansi@>=0.1.0 <0.2.0",
@@ -985,11 +1055,6 @@
       "from": "has-flag@>=3.0.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
     },
-    "has-symbols": {
-      "version": "1.0.0",
-      "from": "has-symbols@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"
-    },
     "hawk": {
       "version": "1.0.0",
       "from": "hawk@>=1.0.0 <1.1.0",
@@ -1071,35 +1136,15 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz"
     },
     "is": {
-      "version": "3.2.1",
-      "from": "is@>=3.2.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz"
+      "version": "3.3.0",
+      "from": "is@>=3.2.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz"
     },
     "is-buffer": {
       "version": "1.1.6",
       "from": "is-buffer@>=1.1.5 <2.0.0",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
     },
-    "is-callable": {
-      "version": "1.1.4",
-      "from": "is-callable@>=1.1.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"
-    },
-    "is-date-object": {
-      "version": "1.0.1",
-      "from": "is-date-object@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"
-    },
-    "is-regex": {
-      "version": "1.0.4",
-      "from": "is-regex@>=1.0.4 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"
-    },
-    "is-symbol": {
-      "version": "1.0.2",
-      "from": "is-symbol@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"
-    },
     "isarray": {
       "version": "0.0.1",
       "from": "isarray@0.0.1",
@@ -1143,9 +1188,9 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.1.1.tgz"
     },
     "just-extend": {
-      "version": "1.1.27",
-      "from": "just-extend@>=1.1.27 <2.0.0",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz"
+      "version": "4.0.2",
+      "from": "just-extend@>=4.0.2 <5.0.0",
+      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz"
     },
     "jwa": {
       "version": "1.1.6",
@@ -1212,11 +1257,6 @@
       "from": "lodash.isempty@>=4.4.0 <5.0.0",
       "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz"
     },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "from": "lodash.isstring@>=4.0.1 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"
-    },
     "lodash.keys": {
       "version": "4.2.0",
       "from": "lodash.keys@>=4.2.0 <5.0.0",
@@ -1237,6 +1277,11 @@
       "from": "lodash.pick@>=4.4.0 <5.0.0",
       "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"
     },
+    "lodash.pickby": {
+      "version": "4.6.0",
+      "from": "lodash.pickby@>=4.6.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz"
+    },
     "lodash.sample": {
       "version": "4.2.1",
       "from": "lodash.sample@>=4.2.1 <5.0.0",
@@ -1253,9 +1298,9 @@
       "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz"
     },
     "logger-sharelatex": {
-      "version": "1.5.6",
-      "from": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.6",
-      "resolved": "git+https://github.com/sharelatex/logger-sharelatex.git#b2956ec56b582b9f4fc8fdda8dc00c06e77c5537",
+      "version": "1.5.9",
+      "from": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.9",
+      "resolved": "git+https://github.com/sharelatex/logger-sharelatex.git#e8e1b95052f62e107336053e4a983f81cdbdf589",
       "dependencies": {
         "assertion-error": {
           "version": "1.1.0",
@@ -1268,15 +1313,20 @@
           "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz"
         },
         "chai": {
-          "version": "4.1.2",
+          "version": "4.2.0",
           "from": "chai@latest",
-          "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz"
+          "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz"
         },
         "deep-eql": {
           "version": "3.0.1",
           "from": "deep-eql@>=3.0.0 <4.0.0",
           "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz"
         },
+        "diff": {
+          "version": "3.5.0",
+          "from": "diff@>=3.5.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"
+        },
         "dtrace-provider": {
           "version": "0.6.0",
           "from": "dtrace-provider@>=0.6.0 <0.7.0",
@@ -1289,21 +1339,14 @@
           "resolved": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-2.0.3.tgz"
         },
         "sinon": {
-          "version": "5.0.7",
+          "version": "7.2.2",
           "from": "sinon@latest",
-          "resolved": "https://registry.npmjs.org/sinon/-/sinon-5.0.7.tgz",
-          "dependencies": {
-            "diff": {
-              "version": "3.5.0",
-              "from": "diff@>=3.1.0 <4.0.0",
-              "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"
-            },
-            "supports-color": {
-              "version": "5.4.0",
-              "from": "supports-color@>=5.1.0 <6.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"
-            }
-          }
+          "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.2.2.tgz"
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "from": "supports-color@>=5.5.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
         },
         "timekeeper": {
           "version": "1.0.0",
@@ -1318,9 +1361,14 @@
       }
     },
     "lolex": {
-      "version": "2.6.0",
-      "from": "lolex@>=2.2.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.6.0.tgz"
+      "version": "3.0.0",
+      "from": "lolex@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-3.0.0.tgz"
+    },
+    "long": {
+      "version": "4.0.0",
+      "from": "long@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz"
     },
     "lru-cache": {
       "version": "2.7.3",
@@ -1358,9 +1406,9 @@
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
     },
     "metrics-sharelatex": {
-      "version": "2.0.8",
-      "from": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.8",
-      "resolved": "git+https://github.com/sharelatex/metrics-sharelatex.git#a56855e935e4e361166706091cf33f252eb0cd24",
+      "version": "2.0.12",
+      "from": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.12",
+      "resolved": "git+https://github.com/sharelatex/metrics-sharelatex.git#3ac1621ef049e2f2d88a83b3a41011333d609662",
       "dependencies": {
         "coffee-script": {
           "version": "1.6.0",
@@ -1471,9 +1519,9 @@
       "optional": true
     },
     "nan": {
-      "version": "2.10.0",
+      "version": "2.12.1",
       "from": "nan@>=2.0.8 <3.0.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
       "optional": true
     },
     "native-or-bluebird": {
@@ -1494,10 +1542,15 @@
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"
     },
     "nise": {
-      "version": "1.3.3",
-      "from": "nise@>=1.2.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-1.3.3.tgz",
+      "version": "1.4.8",
+      "from": "nise@>=1.4.7 <2.0.0",
+      "resolved": "https://registry.npmjs.org/nise/-/nise-1.4.8.tgz",
       "dependencies": {
+        "lolex": {
+          "version": "2.7.5",
+          "from": "lolex@>=2.3.2 <3.0.0",
+          "resolved": "https://registry.npmjs.org/lolex/-/lolex-2.7.5.tgz"
+        },
         "path-to-regexp": {
           "version": "1.7.0",
           "from": "path-to-regexp@>=1.7.0 <2.0.0",
@@ -1526,16 +1579,6 @@
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
       "optional": true
     },
-    "object-keys": {
-      "version": "1.0.12",
-      "from": "object-keys@>=1.0.12 <2.0.0",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz"
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.0.3",
-      "from": "object.getownpropertydescriptors@>=2.0.3 <3.0.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"
-    },
     "on-finished": {
       "version": "2.3.0",
       "from": "on-finished@>=2.3.0 <2.4.0",
@@ -1557,15 +1600,25 @@
       "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
     },
     "p-limit": {
-      "version": "2.0.0",
+      "version": "2.1.0",
       "from": "p-limit@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz"
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz"
     },
     "p-try": {
       "version": "2.0.0",
       "from": "p-try@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz"
     },
+    "parse-duration": {
+      "version": "0.1.1",
+      "from": "parse-duration@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/parse-duration/-/parse-duration-0.1.1.tgz"
+    },
+    "parse-ms": {
+      "version": "2.0.0",
+      "from": "parse-ms@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.0.0.tgz"
+    },
     "parseurl": {
       "version": "1.3.2",
       "from": "parseurl@>=1.3.2 <1.4.0",
@@ -1601,26 +1654,31 @@
       "from": "policyfile@0.0.4",
       "resolved": "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz"
     },
+    "pretty-ms": {
+      "version": "4.0.0",
+      "from": "pretty-ms@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-4.0.0.tgz"
+    },
     "process-nextick-args": {
       "version": "2.0.0",
       "from": "process-nextick-args@>=2.0.0 <2.1.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"
     },
     "prom-client": {
-      "version": "11.2.0",
+      "version": "11.2.1",
       "from": "prom-client@>=11.1.3 <12.0.0",
-      "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.2.0.tgz"
+      "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.2.1.tgz"
+    },
+    "protobufjs": {
+      "version": "6.8.8",
+      "from": "protobufjs@>=6.8.6 <6.9.0",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.8.tgz"
     },
     "proxy-addr": {
       "version": "2.0.3",
       "from": "proxy-addr@>=2.0.3 <2.1.0",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz"
     },
-    "pseudomap": {
-      "version": "1.0.2",
-      "from": "pseudomap@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"
-    },
     "punycode": {
       "version": "1.4.1",
       "from": "punycode@>=1.4.1 <2.0.0",
@@ -1756,9 +1814,9 @@
       "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz"
     },
     "resolve": {
-      "version": "1.8.1",
+      "version": "1.9.0",
       "from": "resolve@>=1.5.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz"
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.9.0.tgz"
     },
     "retry-axios": {
       "version": "0.3.2",
@@ -1781,9 +1839,9 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
     },
     "safe-json-stringify": {
-      "version": "1.1.0",
+      "version": "1.2.0",
       "from": "safe-json-stringify@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
       "optional": true
     },
     "safer-buffer": {
@@ -1791,11 +1849,6 @@
       "from": "safer-buffer@>=2.1.2 <3.0.0",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
     },
-    "samsam": {
-      "version": "1.3.0",
-      "from": "samsam@1.3.0",
-      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz"
-    },
     "sandboxed-module": {
       "version": "0.3.0",
       "from": "sandboxed-module@>=0.3.0 <0.4.0",
@@ -1944,6 +1997,11 @@
       "from": "supports-color@>=0.2.0 <0.3.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
     },
+    "symbol-observable": {
+      "version": "1.2.0",
+      "from": "symbol-observable@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz"
+    },
     "tdigest": {
       "version": "0.1.1",
       "from": "tdigest@>=0.1.1 <0.2.0",
@@ -2041,11 +2099,6 @@
       "from": "util-deprecate@>=1.0.1 <1.1.0",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
     },
-    "util.promisify": {
-      "version": "1.0.0",
-      "from": "util.promisify@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"
-    },
     "utils-merge": {
       "version": "1.0.1",
       "from": "utils-merge@1.0.1",
@@ -2099,9 +2152,9 @@
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
     },
     "yallist": {
-      "version": "2.1.2",
-      "from": "yallist@>=2.1.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"
+      "version": "3.0.3",
+      "from": "yallist@>=3.0.2 <4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz"
     },
     "zeparser": {
       "version": "0.0.5",

+ 3 - 3
services/real-time/package.json

@@ -8,7 +8,7 @@
     "url": "https://github.com/sharelatex/real-time-sharelatex.git"
   },
   "scripts": {
-    "compile:app": "([ -e app/coffee ] && coffee $COFFEE_OPTIONS -o app/js -c app/coffee || echo 'No CoffeeScript folder to compile') && ( [ -e app.coffee ] && coffee $COFFEE_OPTIONS -c app.coffee || echo 'No CoffeeScript app to compile')",
+    "compile:app": "([ -e app/coffee ] && coffee -m $COFFEE_OPTIONS -o app/js -c app/coffee || echo 'No CoffeeScript folder to compile') && ( [ -e app.coffee ] && coffee -m $COFFEE_OPTIONS -c app.coffee || echo 'No CoffeeScript app to compile')",
     "start": "npm run compile:app && node $NODE_APP_OPTIONS app.js",
     "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 30000 --exit $@ test/acceptance/js",
     "test:acceptance": "npm run compile:app && npm run compile:acceptance_tests && npm run test:acceptance:_run -- --grep=$MOCHA_GREP",
@@ -28,8 +28,8 @@
     "cookie-parser": "^1.3.3",
     "express": "^4.10.1",
     "express-session": "^1.9.1",
-    "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.6",
-    "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.8",
+    "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.9",
+    "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.12",
     "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.4",
     "request": "~2.34.0",
     "session.socket.io": "^0.1.6",