Skip to content

Commit 50a2aab

Browse files
authored
use apiv2 in fetch motd (#2795)
1 parent f6ffc3f commit 50a2aab

File tree

1 file changed

+13
-22
lines changed

1 file changed

+13
-22
lines changed

src/fetchMOTD.ts

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import * as _ from "lodash";
21
import * as clc from "cli-color";
3-
import * as request from "request";
42
import * as semver from "semver";
53

4+
import { Client } from "./apiv2";
65
import { configstore } from "./configstore";
7-
import * as api from "./api";
8-
import * as logger from "./logger";
6+
import { realtimeOrigin } from "./api";
97
import * as utils from "./utils";
108

119
const pkg = require("../package.json"); // eslint-disable-line @typescript-eslint/no-var-requires
@@ -21,7 +19,7 @@ export function fetchMOTD(): void {
2119

2220
if (motd && motdFetched > Date.now() - ONE_DAY_MS) {
2321
if (motd.minVersion && semver.gt(motd.minVersion, pkg.version)) {
24-
logger.error(
22+
console.error(
2523
clc.red("Error:"),
2624
"CLI is out of date (on",
2725
clc.bold(pkg.version),
@@ -36,26 +34,19 @@ export function fetchMOTD(): void {
3634
if (motd.message && process.stdout.isTTY) {
3735
const lastMessage = configstore.get("motd.lastMessage");
3836
if (lastMessage !== motd.message) {
39-
logger.info();
40-
logger.info(motd.message);
41-
logger.info();
37+
console.log();
38+
console.log(motd.message);
39+
console.log();
4240
configstore.set("motd.lastMessage", motd.message);
4341
}
4442
}
4543
} else {
46-
request(
47-
{
48-
url: utils.addSubdomain(api.realtimeOrigin, "firebase-public") + "/cli.json",
49-
json: true,
50-
},
51-
(err, res, body) => {
52-
if (err) {
53-
return;
54-
}
55-
motd = _.assign({}, body);
56-
configstore.set("motd", motd);
57-
configstore.set("motd.fetched", Date.now());
58-
}
59-
);
44+
const origin = utils.addSubdomain(realtimeOrigin, "firebase-public");
45+
const c = new Client({ urlPrefix: origin, auth: false });
46+
c.get("/cli.json").then((res) => {
47+
motd = Object.assign({}, res.body);
48+
configstore.set("motd", motd);
49+
configstore.set("motd.fetched", Date.now());
50+
});
6051
}
6152
}

0 commit comments

Comments
 (0)