Upgrade dependencies (#133)

* Update dependencies * Use Node's native fetch() * Upgrade redis * Update bin/update-server.js Co-authored-by: Black-Hole️ <github@bugs.cc> * Update package.json Co-authored-by: Black-Hole️ <github@bugs.cc> * Update src/updates.js Co-authored-by: Black-Hole️ <github@bugs.cc> * Update tests to Node 18 * Do not await res.text() --------- Co-authored-by: Black-Hole️ <github@bugs.cc>
electron · May 18, 2023 · b4600b5 · b4600b5
1 parent d660fdb
commit b4600b5
Show file tree

Hide file tree

Showing 8 changed files with 719 additions and 603 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -19,15 +19,13 @@ version: 2.1
 orbs:
   win: circleci/windows@1.0.0
 jobs:
-  test-linux-14:
+  test-linux-18:
     docker:
-      - image: cimg/node:14.21
+      - image: cimg/node:18.16.0
     <<: *steps-test
 
 workflows:
   version: 2
   test_and_release:
     jobs:
-      - test-linux-14
-
-
+      - test-linux-18
diff --git a/bin/test-update-server.js b/bin/test-update-server.js
@@ -0,0 +1,8 @@
+const { createServer } = require("../test/helpers/create-server");
+
+async function main() {
+  const { server, address } = await createServer();
+  console.log(`Server running at ${address}`);
+}
+
+main();
diff --git a/bin/update-server.js b/bin/update-server.js
@@ -28,41 +28,49 @@ assert(token, "GH_TOKEN required");
 //
 // Cache
 //
+async function getCache() {
+  const fixedRedisUrl = redisUrl.replace("redis://h:", "redis://:");
+  const client = redis.createClient({
+    url: fixedRedisUrl,
+    tls: {
+      rejectUnauthorized: false,
+    },
+  });
 
-const fixedRedisUrl = redisUrl.replace("redis://h:", "redis://:");
-const client = redis.createClient({
-  url: fixedRedisUrl,
-  tls: {
-    rejectUnauthorized: false,
-  },
-});
-const get = promisify(client.get).bind(client);
-const redlock = new Redlock([client], {
-  retryDelay: ms("10s"),
-});
+  await client.connect();
+  await client.ping();
 
-const cache = {
-  async get(key) {
-    const json = await get(key);
-    return json && JSON.parse(json);
-  },
-  async set(key, value) {
-    const multi = client.multi();
-    multi.set(key, JSON.stringify(value));
-    multi.expire(key, ms(cacheTTL) / 1000);
-    const exec = promisify(multi.exec).bind(multi);
-    await exec();
-  },
-  async lock(resource) {
-    return redlock.lock(`locks:${resource}`, ms("1m"));
-  },
-};
+  const redlock = new Redlock([client], {
+    retryDelay: ms("10s"),
+  });
+
+  const cache = {
+    async get(key) {
+      const json = await client.get(key);
+      return json && JSON.parse(json);
+    },
+    async set(key, value) {
+      await client.set(key, JSON.stringify(value), {
+        EX: ms(cacheTTL) / 1000,
+      });
+    },
+    async lock(resource) {
+      return redlock.lock(`locks:${resource}`, ms("1m"));
+    },
+  };
+
+  return cache;
+}
 
 //
 // Go!
 //
+async function main() {
+  const cache = getCache();
+  const updates = new Updates({ token, cache });
+  updates.listen(port, () => {
+    console.log(`http://localhost:${port}`);
+  });
+}
 
-const updates = new Updates({ token, cache });
-updates.listen(port, () => {
-  console.log(`http://localhost:${port}`);
-});
+main();
diff --git a/package.json b/package.json
@@ -2,27 +2,28 @@
   "name": "update.electronjs.org",
   "scripts": {
     "start": "nodemon bin/update-server.js",
-    "prettier": "prettier --write '**/*.js'",
+    "start-test-server": "cross-env NODE_ENV=test nodemon bin/test-update-server.js",
     "lint": "prettier --check '**/*.js'",
+    "prettier": "prettier --write '**/*.js'",
     "test": "npm run lint && cross-env NODE_ENV=test nyc tap test/*.js"
   },
   "dependencies": {
     "dotenv-safe": "^8.2.0",
-    "ms": "^2.1.2",
-    "node-fetch": "^2.6.1",
-    "pino": "^6.7.0",
-    "redis": "^3.1.1",
-    "redlock": "^3.1.2",
-    "request-ip": "^2.1.3",
-    "semver": "^7.3.2"
+    "ms": "^2.1.3",
+    "pino": "^8.12.1",
+    "redis": "^4.6.6",
+    "redlock": "^4.2.0",
+    "request-ip": "^3.3.0",
+    "semver": "^7.5.0"
   },
   "devDependencies": {
-    "cross-env": "^7.0.2",
-    "nock": "^13.0.5",
-    "nodemon": "^2.0.6",
+    "cross-env": "^7.0.3",
+    "nock": "^13.3.1",
+    "node-fetch": "2.6.9",
+    "nodemon": "^2.0.22",
     "nyc": "^15.1.0",
-    "prettier": "^2.8.0",
-    "standard": "^16.0.3",
-    "tap": "^16.3.2"
+    "prettier": "^2.8.8",
+    "standard": "^17.0.0",
+    "tap": "^16.3.4"
   }
-}
+}
diff --git a/src/updates.js b/src/updates.js
@@ -2,7 +2,6 @@
 "use strict";
 
 const http = require("http");
-const { default: fetch } = require("node-fetch");
 const semver = require("semver");
 const assert = require("assert");
 const log = require("pino")();
@@ -12,8 +11,15 @@ const requestIp = require("request-ip");
 const { assetPlatform } = require("./asset-platform");
 const { PLATFORM, PLATFORM_ARCH, PLATFORM_ARCHS } = require("./constants");
 
-const { NODE_ENV: env } = process.env;
-if (env === "test") log.level = "error";
+// TODO: Nock does not support native fetch, use node-fetch instead
+//       This dance will hopefully not be necessary once nock figures
+//       out a way to mock Node's native fetch() implementation
+let fetch = global.fetch;
+
+if (process.env.NODE_ENV === "test") {
+  fetch = require("node-fetch").default;
+  log.level = "error";
+}
 
 class Updates {
   constructor({ token, cache }) {

diff --git a/test/helpers/create-server.js b/test/helpers/create-server.js
@@ -0,0 +1,31 @@
+const Updates = require("../../src/updates");
+
+class MemoryCache {
+  constructor() {
+    this.data = new Map();
+  }
+
+  async get(key) {
+    return this.data.get(key);
+  }
+
+  async set(key, value) {
+    this.data.set(key, value);
+  }
+}
+
+function createServer() {
+  return new Promise((resolve) => {
+    const updates = new Updates({ cache: new MemoryCache() });
+    const server = updates.listen(() => {
+      resolve({
+        server,
+        address: `http://localhost:${server.address().port}`,
+      });
+    });
+  });
+}
+
+module.exports = {
+  createServer,
+};
diff --git a/test/update.test.js b/test/update.test.js
@@ -1,34 +1,9 @@
 "use strict";
 
-const { test } = require("tap");
-const fetch = require("node-fetch");
-const Updates = require("../src/updates");
 const nock = require("nock");
-
-class MemoryCache {
-  constructor() {
-    this.data = new Map();
-  }
-
-  async get(key) {
-    return this.data.get(key);
-  }
-
-  async set(key, value) {
-    this.data.set(key, value);
-  }
-}
-
-const createServer = () =>
-  new Promise((resolve) => {
-    const updates = new Updates({ cache: new MemoryCache() });
-    const server = updates.listen(() => {
-      resolve({
-        server,
-        address: `http://localhost:${server.address().port}`,
-      });
-    });
-  });
+const { test, teardown } = require("tap");
+const Updates = require("../src/updates");
+const { createServer } = require("./helpers/create-server");
 
 nock.disableNetConnect();
 nock.enableNetConnect("localhost");
@@ -191,14 +166,16 @@ test("Updates", async (t) => {
 
   await t.test("Routes", async (t) => {
     const res = await fetch(`${address}/`);
+    void res.text();
     t.equal(res.status, 200);
 
     await t.test("exists and has update", async (t) => {
       for (let i = 0; i < 2; i++) {
         const res = await fetch(`${address}/owner/repo/darwin/0.0.0`);
         t.equal(res.status, 200);
+
         const body = await res.json();
-        t.deepEqual(body, {
+        t.same(body, {
           name: "name",
           url: "mac.zip",
           notes: "notes",
@@ -466,5 +443,7 @@ test("Updates", async (t) => {
     });
   });
 
-  server.close();
+  teardown(() => {
+    server.close();
+  });
 });