fix: unwrap some api features

Author: boyander

package.json

@@ -18,6 +18,8 @@
     "axios": "^1.2.3",
     "fs-extra": "^11.1.0",
     "handlebars": "^4.7.7",
+    "pino": "^8.11.0",
+    "pino-pretty": "^9.4.0",
     "promisify-child-process": "^4.1.1",
     "prompts": "^2.4.2",
     "tslib": "^2.4.1",

src/api/faable_api.ts src/api/FaableApi.tssrc/api/faable_api.ts renamed to src/api/FaableApi.ts

@@ -1,5 +1,5 @@
 import axios, { AxiosError, AxiosInstance, AxiosResponse } from "axios";
-import { AuthStrategy } from "./types";
+import { prepare_client, FaableClientConfig } from "./client";
 export interface FaableApp {
   id: string;
   name: string;
@@ -20,7 +20,11 @@ const wrap_error = async <T>(prom: Promise<AxiosResponse<T>>): Promise<T> => {
     const e: AxiosError<{ message: string }> = error;
     if (e.isAxiosError) {
       const res = e.response;
-      throw new Error(`API Error: ${res.data.message}`);
+      if (res) {
+        throw new Error(`API Error ${res.status}: ${res?.data.message}`);
+      } else {
+        throw new Error(`API Error:${e.message}`);
+      }
     }
     throw error;
   }
@@ -35,37 +39,17 @@ const paginate = async <Q extends Promise<Page<T>>, T>(
   return items;
 };
 
-type FaableApiConfig<T = any> = {
-  authStrategy?: AuthStrategy<T>;
-  auth?: T;
-};
-export class FaableAppsApi {
+type FaableApiConfig<T> = {} & FaableClientConfig<T>;
+
+export class FaableApi<T = any> {
   client: AxiosInstance;
 
-  constructor(config: FaableApiConfig) {
-    const { authStrategy, auth } = config;
-    const strategy = authStrategy && authStrategy(auth);
-    this.client = axios.create({
-      baseURL: "https://api.faable.com",
-    });
-    this.client.interceptors.request.use(
-      async function (config) {
-        // Do something before request is sent
-        const headers = strategy ? await strategy.headers() : {};
-        config.headers.set(headers);
-        // console.log("all headers");
-        // console.log(headers);
-        return config;
-      },
-      function (error) {
-        // Do something with request error
-        return Promise.reject(error);
-      }
-    );
+  constructor(config: FaableApiConfig<T>) {
+    this.client = prepare_client(config);
   }
 
-  static create(config: FaableApiConfig = {}) {
-    return new FaableAppsApi(config);
+  static create<T>(config: FaableApiConfig<T> = {}) {
+    return new FaableApi(config);
   }
 
   async list() {

src/api/authenticateOAuthApp.ts

@@ -1,6 +1,5 @@
 import axios from "axios";
-import { config } from "./config";
-import { AuthStrategy } from "./types";
+import { AuthStrategyBuilder } from "./types";
 
 interface ClientCredentials {
   clientId: string;
@@ -13,9 +12,9 @@ type TokenResponse = {
   token_type: string;
 };
 
-export const authenticateOAuthApp: AuthStrategy<Partial<ClientCredentials>> = (
-  creds = config
-) => {
+export const authenticateOAuthApp: AuthStrategyBuilder<
+  Partial<ClientCredentials>
+> = (creds) => {
   const { clientId, clientSecret } = creds;
   if (!clientId || !clientSecret) {
     throw new Error("Missing credentials. Run faable configure first.");

src/api/client.ts

@@ -0,0 +1,34 @@
+import axios from "axios";
+import { AuthStrategy, AuthStrategyBuilder } from "./types";
+
+export type FaableClientConfig<T = any> = {
+  authStrategy?: AuthStrategyBuilder<T>;
+  auth?: T;
+};
+
+export function prepare_client<T>({
+  authStrategy,
+  auth,
+}: FaableClientConfig<T> = {}) {
+  const strategy: AuthStrategy | undefined = authStrategy && authStrategy(auth);
+  const client = axios.create({
+    baseURL: "https://api.faable.com",
+    timeout: 5000,
+  });
+
+  client.interceptors.request.use(
+    async function (config) {
+      // Do something before request is sent
+      const headers = strategy ? await strategy.headers() : {};
+      config.headers.set(headers);
+      // console.log("all headers");
+      // console.log(headers);
+      return config;
+    },
+    function (error) {
+      // Do something with request error
+      return Promise.reject(error);
+    }
+  );
+  return client;
+}

src/api/context.ts

@@ -1,9 +1,9 @@
-import { FaableAppsApi } from "./faable_api";
-
+import { FaableApi } from "./FaableApi";
+import { authenticateOAuthApp } from "./authenticateOAuthApp";
 export const context = async () => {
-  const strategy = (await import("./authenticateOAuthApp"))
-    .authenticateOAuthApp;
+  const authStrategy = authenticateOAuthApp;
+  const { config } = await import("./userdir_config");
   return {
-    api: FaableAppsApi.create({ authStrategy: strategy }),
+    api: FaableApi.create({ authStrategy, auth: config }),
   };
 };

src/api/types.ts

@@ -1,4 +1,4 @@
-export type AuthStrategyResponse = {
+export type AuthStrategy = {
   headers: () => Promise<Record<string, string>>;
 };
-export type AuthStrategy<T> = (...params: T[]) => AuthStrategyResponse;
+export type AuthStrategyBuilder<T> = (...params: T[]) => AuthStrategy;

src/api/config.ts src/api/userdir_config.tssrc/api/config.ts renamed to src/api/userdir_config.ts

@@ -1,11 +1,11 @@
 import { CommandModule } from "yargs";
 import prompts from "prompts";
-import { FaableAppsApi } from "../../api/faable_api";
+import { FaableApi } from "../../api/FaableApi";
 import fs from "fs-extra";
 import os from "os";
 import path from "path";
 type Options = {
-  api: FaableAppsApi;
+  api: FaableApi;
   app_name: string;
   workdir: string;
   remove: boolean;

src/commands/configure/index.ts

@@ -9,18 +9,18 @@ interface AnalyzePackage {
 
 export const analyze_package = async ({ workdir }: AnalyzePackage) => {
   const package_file = path.join(path.resolve(workdir), "package.json");
-  log.info(`Reading ${package_file}`);
+  log.info(`Loading config from package.json...`);
   const pkg: PackageJson = await fs.readJSON(package_file);
 
   // Package must have a start script
   if (!pkg?.scripts?.start) {
-    throw new Error("Missing start script on package.json");
+    throw new Error("Missing start script");
   }
 
   // Check if build is required to run
   let hasBuild = false;
   if (pkg?.scripts?.build) {
-    log.info(`Build script found`);
+    log.info(`Build step: ${pkg?.scripts?.build}`);
     hasBuild = true;
   } else {
     log.info(`No build script found`);

src/commands/deploy/analyze_package.ts

@@ -1,4 +1,4 @@
-import { FaableAppRegistry } from "../../api/faable_api";
+import { FaableAppRegistry } from "../../api/FaableApi";
 import { log } from "../../log";
 import { cmd } from "./cmd";