Downgrade p-vent

alexwohlbruck · May 1, 2022 · 074c8c3 · 074c8c3
1 parent 637fcdf
commit 074c8c3
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
  "mongoose": "^6.2.4",
  "mongoose-autopopulate": "^0.16.0",
  "mongoose-findorcreate": "^3.0.0",
- "p-event": "^5.0.1",
+ "p-event": "^4.2.0",
  "passport": "^0.5.2",
  "passport-google-id-token": "^0.4.7",
  "path": "^0.12.7",

diff --git a/server/passport.ts b/server/passport.ts
@@ -24,7 +24,7 @@ passport.use(new GoogleTokenStrategy(
  async (parsedToken: any, googleId: string, done: any) => {
  try {
  const u = parsedToken.payload
- 
+
  const { doc: user } = await (UserModel as any).findOrCreate({
  googleId,
  ...u,

diff --git a/server/services/lamps.ts b/server/services/lamps.ts
@@ -1,11 +1,11 @@
+import pEvent from 'p-event'
 import { Types } from 'mongoose'
 import { RequestException } from '../routes'
 import { toKebab } from '../helpers'
 import { LampModel, LampState } from '../models/lamp'
 import { GroupModel } from '../models/group'
 import { updateGroupState } from './groups'
 import { broadcast, broadcastToDevices, broadcastToUsers, WSPayload, eventEmiter } from '../websockets'
-import { pEvent } from 'p-event'
 
 // Send a message to all the members of a group with the given lamp ID
 const broadcastToGroup = async (groupId: string, payload: WSPayload) => {

diff --git a/tslint.json b/tslint.json
@@ -17,6 +17,9 @@
  "info"
  ]
  }
+ ],
+ "no-var-requires": [
+ false
  ]
  },
  "rulesDirectory": []

diff --git a/yarn.lock b/yarn.lock
@@ -1988,17 +1988,24 @@ p-cancelable@^1.0.0:
  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
-p-event@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/p-event/-/p-event-5.0.1.tgz#614624ec02ae7f4f13d09a721c90586184af5b0c"
- integrity sha512-dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ==
+p-event@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/p-event/-/p-event-4.2.0.tgz#af4b049c8acd91ae81083ebd1e6f5cae2044c1b5"
+ integrity sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==
  dependencies:
- p-timeout "^5.0.2"
+ p-timeout "^3.1.0"
 
-p-timeout@^5.0.2:
- version "5.0.2"
- resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-5.0.2.tgz#d12964c4b2f988e15f72b455c2c428d82a0ec0a0"
- integrity sha512-sEmji9Yaq+Tw+STwsGAE56hf7gMy9p0tQfJojIAamB7WHJYJKf1qlsg9jqBWG8q9VCxKPhZaP/AcXwEoBcYQhQ==
+p-finally@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+ integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-timeout@^3.1.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+ integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+ dependencies:
+ p-finally "^1.0.0"
 
 package-json@^6.3.0:
  version "6.5.0"