Update dependencies and fix bugs #197

this branch has been partially live for a while, everything except the server, which dependencies i didn't touch yet but the shared ones most likely broke it

Author: vfeskov

.circleci/config.yml

@@ -27,5 +27,4 @@ workflows:
           filters:
             branches:
               only:
-                - master
                 - deploy-circleci

lib/package-lock.json

@@ -10,21 +10,15 @@
   "author": "Vladimir Feskov",
   "license": "MIT",
   "devDependencies": {
-    "@types/chai": "^4.2.12",
-    "@types/mocha": "^7.0.2",
-    "@types/mongodb": "^3.5.25",
-    "@types/mongoose": "^5.7.36",
-    "@types/nock": "^11.1.0",
-    "@types/node-fetch": "^2.5.7",
-    "chai": "^4.2.0",
-    "mocha": "^7.2.0",
-    "nock": "^12.0.3",
-    "ts-node": "^8.10.2",
-    "typescript": "^3.9.7"
+    "@types/node-fetch": "^2.6.2",
+    "ts-node": "^10.9.1",
+    "type-fest": "^2.19.0",
+    "typescript": "^4.7.4"
   },
+  "type": "module",
   "dependencies": {
-    "mongodb": "^3.6.0",
-    "mongoose": "^5.9.28",
-    "node-fetch": "2.6.0"
+    "mongoose": "^6.5.2",
+    "node-fetch": "^3.2.10",
+    "timeout-signal": "^1.1.0"
   }
 }

lib/package.json

@@ -1,8 +1,8 @@
-import "./connection";
-import * as mongoose from "mongoose";
+import "./connection.js";
+import mongoose from "mongoose";
 
 const AccessTokenSchema = new mongoose.Schema(
-  { accessToken: String },
+  { accessToken: { type: String, required: true } },
   { bufferCommands: false }
 );
 export const AccessTokenModel = mongoose.model(

lib/src/db/AccessToken.ts

@@ -1,6 +1,5 @@
-import { ObjectID } from "mongodb";
-import * as mongoose from "mongoose";
-import "./connection";
+import mongoose from "mongoose";
+import "./connection.js";
 const { assign, keys } = Object;
 
 const reposValidator = (repos: string[]) => {
@@ -58,10 +57,10 @@ const userSchemaObj: mongoose.SchemaDefinition = {
     validate: { validator: Number.isInteger },
   },
 };
-const UserSchema = new mongoose.Schema(userSchemaObj, {
+const UserSchema = new mongoose.Schema<RawUser>(userSchemaObj, {
   bufferCommands: false,
 });
-export const UserModel = mongoose.model("User", UserSchema);
+export const UserModel = mongoose.model<RawUser>("User", UserSchema);
 
 export class CuteRepo {
   filter: number;
@@ -89,24 +88,26 @@ export class UpdateAllReposParams {
 }
 
 export class RawUser {
-  _id?: ObjectID;
-  accessToken?: string;
-  alerted?: string[][];
+  _id: mongoose.Types.ObjectId;
+  accessToken: string;
+  alerted: string[][];
   checkAt?: number;
-  email?: string;
+  email: string;
   frequency?: string;
   githubId?: number;
-  majors?: string[];
-  minors?: string[];
-  mutedRepos?: string[];
+  majors: string[];
+  minors: string[];
+  mutedRepos: string[];
   passwordEncrypted?: string;
-  patches?: string[];
-  repos?: string[];
+  patches: string[];
+  repos: string[];
   watching?: boolean;
   watchingStars?: number;
   [key: string]: any;
 }
 
+export type RawUserUpdate = Partial<RawUser>;
+
 export class User extends CuteUser {
   constructor(params: CuteUser) {
     super();
@@ -189,7 +190,7 @@ export class User extends CuteUser {
   static async load(conditions: any) {
     const { id, ...rest } = conditions;
     if (id) {
-      conditions = { _id: new ObjectID(id), ...rest };
+      conditions = { _id: new mongoose.Types.ObjectId(id), ...rest };
     }
     const raw = await UserModel.findOne(conditions);
     return raw ? new User(toCute(raw)) : null;
@@ -261,7 +262,7 @@ export class User extends CuteUser {
     params: UpdateAllReposParams
   ) {
     const { muted, filter } = params;
-    const command: RawUser = {};
+    const command: RawUserUpdate = {};
     const repoNames = repos.map((r) => r.repo);
     if (typeof muted !== "undefined") {
       command.mutedRepos = muted ? repoNames : [];
@@ -281,9 +282,9 @@ export class User extends CuteUser {
 }
 
 function toRaw({ id, repos, ...rest }: CuteUser): RawUser {
-  const result: RawUser = rest;
+  const result: RawUserUpdate = rest;
   if (id) {
-    result._id = new ObjectID(id);
+    result._id = new mongoose.Types.ObjectId(id);
   }
   if (repos) {
     assign(result, {
@@ -296,7 +297,7 @@ function toRaw({ id, repos, ...rest }: CuteUser): RawUser {
   }
   return Object.keys(result)
     .filter((k) => k === "_id" || !!userSchemaObj[k])
-    .reduce((r, k) => ({ ...r, [k]: result[k] }), {});
+    .reduce((r, k) => ({ ...r, [k]: result[k] }), {} as RawUser);
 }
 
 function toCute(raw: RawUser): CuteUser {

lib/src/db/User.ts

@@ -1,20 +1,18 @@
-import * as mongoose from "mongoose";
-import log from "../log";
+import mongoose from "mongoose";
+import log from "../log.js";
 
-export const connection = mongoose.connect(process.env.WAB_MONGODB_URL, {
-  useNewUrlParser: true,
-  useUnifiedTopology: true,
-  bufferMaxEntries: 0,
-});
+export function connect() {
+  return mongoose.connect(process.env.WAB_MONGODB_URL);
+}
+
+export const connection = mongoose.connection;
 
 export function disconnect() {
-  return connection.then(
-    (con) => con.disconnect(),
-    (e) =>
-      log("disconnectError", {
-        name: e.name,
-        message: e.message,
-        stack: e.stack,
-      })
+  return mongoose.disconnect().catch((e) =>
+    log("disconnectError", {
+      name: e.name,
+      message: e.message,
+      stack: e.stack,
+    })
   );
 }

lib/src/db/connection.ts

@@ -1,3 +1,3 @@
-export * from "./User";
-export * from "./AccessToken";
-export * from "./connection";
+export * from "./User.js";
+export * from "./AccessToken.js";
+export * from "./connection.js";

lib/src/db/index.ts

@@ -1,8 +1,9 @@
 // Reusable service to work with GitHub's Atom feeds
 import fetch from "node-fetch";
+import timeoutSignal from "timeout-signal";
 import { Agent } from "https";
-import log from "./log";
-import timeout from "./timeout";
+import log from "./log.js";
+import timeout from "./timeout.js";
 
 export const FETCH_ATTEMPTS = 3;
 export const FETCH_ATTEMPTS_INTERVAL = 60000;
@@ -26,7 +27,10 @@ export async function fetchAtom(url: string, includeEntry: boolean) {
   while (attempts < FETCH_ATTEMPTS) {
     try {
       attempts++;
-      const response = await fetch(url, { agent, timeout: FETCH_TIMEOUT });
+      const response = await fetch(url, {
+        // agent,
+        signal: timeoutSignal(FETCH_TIMEOUT),
+      });
       const { status } = response;
       if (status >= 400 && status < 500) {
         throw new BadRequest(status);
@@ -132,7 +136,7 @@ export class BadRequest extends BaseErrorWithStatus {
 }
 
 const ENTRY_REGEXP = /<entry>[\s\S]*?<\/entry>/gm;
-const ID_REGEXP = new RegExp("<id>[^<]+/([^/<]+)</id>");
+const ID_REGEXP = new RegExp("<id>[^<]+Repository/\\d+/([^<]+)</id>");
 
 function parse(xml: string, includeEntry: boolean) {
   return (xml.match(ENTRY_REGEXP) || [])

lib/src/githubAtom.ts

@@ -10,7 +10,7 @@ export function timeout(ms: number) {
 }
 
 export function testTimeout(ms: number) {
-  return new Promise((resolve) => {
+  return new Promise<void>((resolve) => {
     _testTimePassed += ms;
     resolve();
   });

lib/src/timeout.ts

@@ -1,11 +1,13 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
+    "module": "ESNext",
+    "moduleResolution": "node",
     "noImplicitAny": true,
     "removeComments": true,
     "declaration": true,
     "target": "es2017",
-    "outDir": "."
+    "outDir": ".",
+    "esModuleInterop": true
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "**/*.spec.ts"]