removing request and api from functions shell

src/deploy/functions/runtimes/discovery/index.ts

@@ -1,4 +1,4 @@
-import fetch from "node-fetch";
+import fetch, { Response } from "node-fetch";
 import * as fs from "fs";
 import * as path from "path";
 import * as yaml from "js-yaml";
@@ -62,8 +62,7 @@ export async function detectFromPort(
  runtime: runtimes.Runtime,
  timeout = 30_000 /* 30s to boot up */
 ): Promise<backend.Backend> {
- // The result type of fetch isn't exported
- let res: { text(): Promise<string> };
+ let res: Response;
  const timedOut = new Promise<never>((resolve, reject) => {
  setTimeout(() => {
  reject(new FirebaseError("User code failed to load. Cannot determine backend specification"));

src/functionsShellCommandAction.ts

@@ -1,21 +1,18 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
 import * as clc from "cli-color";
 import * as repl from "repl";
 import * as _ from "lodash";
-import * as request from "request";
 import * as util from "util";
 
-import { FunctionsServer } from "./serve/functions";
-import * as LocalFunction from "./localFunction";
-import * as utils from "./utils";
-import { logger } from "./logger";
-import * as shell from "./emulator/functionsEmulatorShell";
-import * as commandUtils from "./emulator/commandUtils";
-import { EMULATORS_SUPPORTED_BY_FUNCTIONS, EmulatorInfo, Emulators } from "./emulator/types";
 import { EmulatorHubClient } from "./emulator/hubClient";
-import { Constants } from "./emulator/constants";
+import { EMULATORS_SUPPORTED_BY_FUNCTIONS, EmulatorInfo, Emulators } from "./emulator/types";
 import { findAvailablePort } from "./emulator/portUtils";
+import { FunctionsServer } from "./serve/functions";
+import { logger } from "./logger";
 import { Options } from "./options";
+import * as commandUtils from "./emulator/commandUtils";
+import * as LocalFunction from "./localFunction";
+import * as shell from "./emulator/functionsEmulatorShell";
+import * as utils from "./utils";
 
 const serveFunctions = new FunctionsServer();
 
@@ -111,11 +108,6 @@ export const actionFunction = async (options: Options) => {
  );
 
  const writer = (output: any) => {
- // Prevent full print out of Request object when a request is made
- // @ts-ignore
- if (output instanceof request.Request) {
- return "Sent request to function.";
- }
  return util.inspect(output);
  };
 

src/localFunction.js

@@ -1,7 +1,7 @@
 "use strict";
 
 var _ = require("lodash");
-var request = require("request");
+var { Client } = require("./apiv2");
 
 var { encodeFirestoreValue } = require("./firestore/encodeFirestoreValue");
 var utils = require("./utils");
@@ -28,11 +28,28 @@ var LocalFunction = function (trigger, urls, controller) {
  if (isCallable == "true") {
  this.call = this._constructCallableFunc.bind(this);
  } else {
- this.call = request.defaults({
- callback: this._requestCallBack,
- baseUrl: this.url,
- uri: "",
- });
+ const callClient = new Client({ urlPrefix: this.url, auth: false });
+ this.call = (data, opts) => {
+ callClient
+ .get("", opts)
+ .then((res) => {
+ this._requestCallBack(undefined, res, res.body);
+ })
+ .catch((err) => {
+ this._requestCallBack(err);
+ });
+ };
+ for (const method of ["get", "post", "put", "patch", "delete"]) {
+ this.call[method] = (data, opts) => {
+ callClient[method]("", data, opts)
+ .then((res) => {
+ this._requestCallBack(undefined, res, res.body);
+ })
+ .catch((err) => {
+ this._requestCallBack(err);
+ });
+ };
+ }
  }
  } else {
  this.call = this._call.bind(this);
@@ -64,14 +81,15 @@ LocalFunction.prototype._constructCallableFunc = function (data, opts) {
  headers["Firebase-Instance-ID-Token"] = opts.instanceIdToken;
  }
 
- return request.post({
- callback: this._requestCallBack,
- baseUrl: this.url,
- uri: "",
- body: { data: data },
- json: true,
- headers: headers,
- });
+ const client = new Client({ urlPrefix: this.url, auth: false });
+ void client
+ .post("", data, { headers })
+ .then((res) => {
+ this._requestCallBack(undefined, res, res.body);
+ })
+ .catch((err) => {
+ this._requestCallBack(err);
+ });
 };
 
 LocalFunction.prototype._constructAuth = function (auth, authType) {
@@ -135,7 +153,7 @@ LocalFunction.prototype._requestCallBack = function (err, response, body) {
  if (err) {
  return console.warn("\nERROR SENDING REQUEST: " + err);
  }
- var status = response ? response.statusCode + ", " : "";
+ var status = response ? response.status + ", " : "";
 
  // If the body is a string we want to check if we can parse it as JSON
  // and pretty-print it. We can't blindly stringify because stringifying