@faable/deploy-sdk 1.0.4 → 1.0.6

package/dist/FaableDeployApi.d.ts

@@ -1,12 +1,5 @@
-import { Page } from "./helpers/paginator.js";
-import { FetcherCreateParams } from "./fetcher/Fetcher.js";
-type ApiParams = {
-    fetcher?: FetcherCreateParams;
-    auth?: FetcherCreateParams;
-};
-export declare class FaableDeployApi {
-    private fetcher;
-    private paginator;
+import { FaableApi, ApiParams } from "@faable/sdk-base";
+export declare class DeployApi extends FaableApi {
     constructor(params?: ApiParams);
     getDeployment(id: string): Promise<{
         id: string;
@@ -47,14 +40,12 @@ export declare class FaableDeployApi {
     }>;
     listApps(): {
         all: () => Promise<unknown[]>;
-        first: () => Promise<Page<unknown>>;
+        first: () => Promise<import("@faable/sdk-base/dist/helpers/paginator.js").Page<unknown>>;
         pass: (params?: {
             cursor?: string;
             pageSize?: string;
-        }) => Promise<Page<unknown>>;
+        }) => Promise<import("@faable/sdk-base/dist/helpers/paginator.js").Page<unknown>>;
     };
     updateStatus<T>(id: string, data: T): Promise<unknown>;
 }
-export declare const faableapi: (params?: ApiParams) => FaableDeployApi;
-export {};
 //# sourceMappingURL=FaableDeployApi.d.ts.map

package/dist/FaableDeployApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FaableDeployApi.d.ts","sourceRoot":"","sources":["../src/FaableDeployApi.ts"],"names":[],"mappings":"AACA,OAAO,EAA6B,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAEzE,OAAO,EAAW,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEpE,KAAK,SAAS,GAAG;IACf,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,IAAI,CAAC,EAAE,mBAAmB,CAAC;CAC5B,CAAC;AAEF,qBAAa,eAAe;IAC1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,SAAS,CAAY;gBAEjB,MAAM,GAAE,SAAc;IASlC,aAAa,CAAC,EAAE,EAAE,MAAM;;;;gBAiBmx1B,8CAAsB;;;;IAdj01B,MAAM,CAAC,EAAE,EAAE,MAAM;;;;;gBAc6smB,CAAC;;;;sBAA6I,CAAC;;;;;;;;;iBAAyU,8CAAsB;;;;;;;;gBAAyf,8CAAsB;;;IAX3toB,QAAQ;;;;;;;;IAGR,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;CAGpC;AAED,eAAO,MAAM,SAAS,YAAY,SAAS,oBAE1C,CAAC"}
+{"version":3,"file":"FaableDeployApi.d.ts","sourceRoot":"","sources":["../src/FaableDeployApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGxD,qBAAa,SAAU,SAAQ,SAAS;gBAC1B,MAAM,CAAC,EAAE,SAAS;IAO9B,aAAa,CAAC,EAAE,EAAE,MAAM;;;;gBAayv2B,8CAAsB;;;;IAVvy2B,MAAM,CAAC,EAAE,EAAE,MAAM;;;;;gBAUmrnB,CAAC;;;;sBAA6I,CAAC;;;;;;;;;iBAAyU,8CAAsB;;;;;;;;gBAAyf,8CAAsB;;;IAPjspB,QAAQ;;;;kBAFN,CAAC;oBAA0B,CAAC;;;IAK9B,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;CAGpC"}

package/dist/FaableDeployApi.js

@@ -1,15 +1,10 @@
-import { buildPaginator } from "./helpers/paginator.js";
-import { fetcher_axios } from "./fetcher/fetcher_axios.js";
-export class FaableDeployApi {
-    fetcher;
-    paginator;
-    constructor(params = {}) {
-        this.fetcher = fetcher_axios({
+import { FaableApi } from "@faable/sdk-base";
+export class DeployApi extends FaableApi {
+    constructor(params) {
+        super({
+            ...params,
             baseURL: "https://api.faable.com",
-            ...params.fetcher,
-            ...params.auth,
         });
-        this.paginator = buildPaginator(this.fetcher);
     }
     getDeployment(id) {
         return this.fetcher.get(`/deployment/${id}`);
@@ -24,6 +19,3 @@ export class FaableDeployApi {
         return this.fetcher.post(`/status/${id}`, data);
     }
 }
-export const faableapi = (params = {}) => {
-    return new FaableDeployApi(params);
-};

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./FaableDeployApi.js";
-import * as auth from "./auth/apikey.js";
 import * as types from "./api/api-types.js";
-export { types, auth };
+export { types };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,OAAO,KAAK,IAAI,MAAM,kBAAkB,CAAC;AACzC,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,CAAC"}

package/dist/index.js

@@ -1,4 +1,3 @@
 export * from "./FaableDeployApi.js";
-import * as auth from "./auth/apikey.js";
 import * as types from "./api/api-types.js";
-export { types, auth };
+export { types };

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@faable/deploy-sdk",
-  "version": "1.0.4",
+  "description": "Codebase for SDK building",
+  "version": "1.0.6",
   "author": "Marc Pomar <marc@faable.com>",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,12 +11,12 @@
     "access": "public"
   },
   "dependencies": {
-    "axios": "^1.7.7",
-    "jwt-decode": "^4.0.0"
+    "@faable/sdk-base": "^1.0.10"
   },
   "devDependencies": {
     "@septh/ts-run": "^1.3.0",
     "@types/node": "^22.5.5",
+    "@types/ramda": "^0.30.2",
     "ava": "^6.1.3",
     "dotenv": "^16.4.5",
     "openapi-typescript": "^7.4.0",

package/dist/auth/apikey.d.ts

@@ -1,3 +0,0 @@
-import { FetcherCreateParams } from "../fetcher/Fetcher.js";
-export declare const createApikeyAuth: (apikey?: string) => FetcherCreateParams;
-//# sourceMappingURL=apikey.d.ts.map

package/dist/auth/apikey.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"apikey.d.ts","sourceRoot":"","sources":["../../src/auth/apikey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,eAAO,MAAM,gBAAgB,YACnB,MAAM,KACb,mBAMF,CAAC"}

package/dist/auth/apikey.js

@@ -1,7 +0,0 @@
-export const createApikeyAuth = (apikey = process.env.FAABLE_APIKEY || "") => {
-    return {
-        headers: {
-            authorization: `basic ${btoa(`${apikey}:${apikey}`)}`,
-        },
-    };
-};

package/dist/fetcher/Fetcher.d.ts

@@ -1,21 +0,0 @@
-type Method = "get" | "GET" | "delete" | "DELETE" | "head" | "HEAD" | "options" | "OPTIONS" | "post" | "POST" | "put" | "PUT" | "patch" | "PATCH" | "purge" | "PURGE" | "link" | "LINK" | "unlink" | "UNLINK";
-export type FetcherRequestParams = {
-    url: string;
-    method?: Method;
-    params?: any;
-};
-export type Headers = {
-    authorization?: string;
-};
-export type FetcherCreateParams = {
-    baseURL?: string;
-    headers?: Headers;
-};
-export type Fetcher = {
-    get: <T>(url: string) => Promise<T>;
-    post: <T>(url: string, data: any) => Promise<T>;
-    request: <T>(params: FetcherRequestParams) => Promise<T>;
-    check: <T>(url: string, status?: number) => Promise<boolean>;
-};
-export {};
-//# sourceMappingURL=Fetcher.d.ts.map

package/dist/fetcher/Fetcher.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Fetcher.d.ts","sourceRoot":"","sources":["../../src/fetcher/Fetcher.ts"],"names":[],"mappings":"AAAA,KAAK,MAAM,GACP,KAAK,GACL,KAAK,GACL,QAAQ,GACR,QAAQ,GACR,MAAM,GACN,MAAM,GACN,SAAS,GACT,SAAS,GACT,MAAM,GACN,MAAM,GACN,KAAK,GACL,KAAK,GACL,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,MAAM,GACN,MAAM,GACN,QAAQ,GACR,QAAQ,CAAC;AACb,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACpC,IAAI,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAChD,OAAO,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,oBAAoB,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACzD,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9D,CAAC"}

package/dist/fetcher/Fetcher.js

@@ -1 +0,0 @@
-export {};

package/dist/fetcher/fetcher_axios.d.ts

@@ -1,3 +0,0 @@
-import { Fetcher, FetcherCreateParams } from "./Fetcher.js";
-export declare const fetcher_axios: (params?: FetcherCreateParams) => Fetcher;
-//# sourceMappingURL=fetcher_axios.d.ts.map

package/dist/fetcher/fetcher_axios.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fetcher_axios.d.ts","sourceRoot":"","sources":["../../src/fetcher/fetcher_axios.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAS5D,eAAO,MAAM,aAAa,YAAY,mBAAmB,KAAQ,OAqChE,CAAC"}

package/dist/fetcher/fetcher_axios.js

@@ -1,43 +0,0 @@
-import axios from "axios";
-import { FaableApiError } from "../helpers/error_handler.js";
-const handleErrorInterceptor = async (e) => {
-    const data = e.response?.data;
-    throw new FaableApiError(`FaableApiError: ${data?.message} (status=${e.response?.status}, url=${e.response?.config.url})`);
-};
-export const fetcher_axios = (params = {}) => {
-    const instance = axios.create(params);
-    // Add base interceptor
-    instance.interceptors.response.use((res) => {
-        //console.log(`Request ${res.config.url}`);
-        return res;
-    }, handleErrorInterceptor);
-    return {
-        get: async (url) => {
-            const res = await instance.request({
-                method: "GET",
-                url,
-            });
-            return res.data;
-        },
-        post: async (url, data) => {
-            const res = await instance.request({
-                method: "POST",
-                url,
-                data,
-            });
-            return res.data;
-        },
-        request: async (params) => {
-            const res = await instance.request(params);
-            return res.data;
-        },
-        check: async (url) => {
-            const res = await instance.request({
-                method: "GET",
-                url,
-                validateStatus: () => true,
-            });
-            return res.status == 200;
-        },
-    };
-};

package/dist/helpers/authorize-client-credentials.d.ts

@@ -1,17 +0,0 @@
-export type ClientCredentialsConfig = {
-    domain: string;
-    clientId: string;
-    clientSecret: string;
-};
-export interface ClientCredentialsResponse {
-    access_token: string;
-}
-export declare class ClientCredentialsFlow {
-    private config;
-    constructor(config: ClientCredentialsConfig);
-    private response?;
-    private isTokenExpired;
-    private _getToken;
-    getToken(): Promise<string>;
-}
-//# sourceMappingURL=authorize-client-credentials.d.ts.map

package/dist/helpers/authorize-client-credentials.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"authorize-client-credentials.d.ts","sourceRoot":"","sources":["../../src/helpers/authorize-client-credentials.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACxC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,qBAAqB;IACpB,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,uBAAuB;IAEnD,OAAO,CAAC,QAAQ,CAAC,CAA4B;IAE7C,OAAO,CAAC,cAAc;YAUR,SAAS;IAgBjB,QAAQ;CASf"}

package/dist/helpers/authorize-client-credentials.js

@@ -1,38 +0,0 @@
-import axios from "axios";
-import { jwtDecode } from "jwt-decode";
-export class ClientCredentialsFlow {
-    config;
-    constructor(config) {
-        this.config = config;
-    }
-    response;
-    isTokenExpired() {
-        if (!this.response)
-            throw new Error("No token");
-        let { exp } = jwtDecode(this.response?.access_token);
-        if (!exp) {
-            throw new Error("Missing expire date");
-        }
-        const currentSeconds = new Date().getTime() / 1000;
-        return currentSeconds > exp;
-    }
-    async _getToken() {
-        const params = new URLSearchParams();
-        params.append("grant_type", "client_credentials");
-        params.append("client_id", this.config.clientId);
-        params.append("client_secret", this.config.clientSecret);
-        const res = await axios.post(this.config.domain + "/oauth/token", params);
-        this.response = res.data;
-        console.log(`[${this.config.domain}] ✅ Client Credentials flow completed `);
-        return this.response;
-    }
-    async getToken() {
-        if (!this.response || this.isTokenExpired()) {
-            await this._getToken();
-        }
-        if (!this.response?.access_token) {
-            throw new Error("Cannot get token");
-        }
-        return this.response?.access_token;
-    }
-}

package/dist/helpers/authorize.d.ts

@@ -1,9 +0,0 @@
-import { AxiosInstance } from "axios";
-import { ClientCredentialsConfig } from "./authorize-client-credentials.js";
-interface AuthConfig {
-    client?: AxiosInstance;
-    client_credentials?: ClientCredentialsConfig;
-}
-export declare const authorize: (_config?: AuthConfig) => AxiosInstance;
-export {};
-//# sourceMappingURL=authorize.d.ts.map

package/dist/helpers/authorize.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"authorize.d.ts","sourceRoot":"","sources":["../../src/helpers/authorize.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE7C,OAAO,EAEL,uBAAuB,EACxB,MAAM,mCAAmC,CAAC;AAE3C,UAAU,UAAU;IAClB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,kBAAkB,CAAC,EAAE,uBAAuB,CAAC;CAC9C;AAED,eAAO,MAAM,SAAS,aAAc,UAAU,kBA6C7C,CAAC"}

package/dist/helpers/authorize.js

@@ -1,39 +0,0 @@
-import axios from "axios";
-import { ClientCredentialsFlow, } from "./authorize-client-credentials.js";
-export const authorize = (_config) => {
-    const authDomain = process.env.FAABLEAUTH_DOMAIN || _config?.client_credentials?.domain || "";
-    if (!authDomain) {
-        throw new Error("Setup Faable Auth failed, missing env FAABLEAUTH_DOMAIN");
-    }
-    const client_credentials_config = {
-        domain: authDomain,
-        clientId: process.env.FAABLEAUTH_CLIENT_ID ||
-            _config?.client_credentials?.clientId ||
-            "",
-        clientSecret: process.env.FAABLEAUTH_CLIENT_SECRET ||
-            _config?.client_credentials?.clientSecret ||
-            "",
-    };
-    // Reuse client or setup a new one
-    const client = _config?.client || axios.create({ baseURL: authDomain });
-    // Config is OK
-    let enable_client_credentials = false;
-    if (client_credentials_config.domain &&
-        client_credentials_config.clientId &&
-        client_credentials_config.clientSecret) {
-        enable_client_credentials = true;
-        console.log(`[${client_credentials_config.domain}] Using client credentials`);
-    }
-    else {
-        console.warn(`Client credentials not configured`);
-    }
-    const flow = new ClientCredentialsFlow(client_credentials_config);
-    client.interceptors.request.use(async function (config) {
-        if (enable_client_credentials) {
-            const token = await flow.getToken();
-            config.headers.set("Authorization", `Bearer ${token}`);
-        }
-        return config;
-    });
-    return client;
-};

package/dist/helpers/error_handler.d.ts

@@ -1,4 +0,0 @@
-export declare class FaableApiError extends Error {
-    constructor(msg: string);
-}
-//# sourceMappingURL=error_handler.d.ts.map

package/dist/helpers/error_handler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"error_handler.d.ts","sourceRoot":"","sources":["../../src/helpers/error_handler.ts"],"names":[],"mappings":"AAAA,qBAAa,cAAe,SAAQ,KAAK;gBAC3B,GAAG,EAAE,MAAM;CAKxB"}

package/dist/helpers/error_handler.js

@@ -1,7 +0,0 @@
-export class FaableApiError extends Error {
-    constructor(msg) {
-        super(msg);
-        this.name = "FaableApiError";
-        Object.setPrototypeOf(this, FaableApiError.prototype);
-    }
-}

package/dist/helpers/paginator.d.ts

@@ -1,15 +0,0 @@
-import { Fetcher, FetcherRequestParams } from "../fetcher/Fetcher.js";
-export interface Page<T> {
-    next: string | null;
-    results: T[];
-}
-export type Paginator = ReturnType<typeof buildPaginator>;
-export declare const buildPaginator: (fetcher: Fetcher) => <T>(req: FetcherRequestParams) => {
-    all: () => Promise<T[]>;
-    first: () => Promise<Page<T>>;
-    pass: (params?: {
-        cursor?: string;
-        pageSize?: string;
-    }) => Promise<Page<T>>;
-};
-//# sourceMappingURL=paginator.d.ts.map

package/dist/helpers/paginator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"paginator.d.ts","sourceRoot":"","sources":["../../src/helpers/paginator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAEtE,MAAM,WAAW,IAAI,CAAC,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,CAAC,EAAE,CAAC;CACd;AACD,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAC1D,eAAO,MAAM,cAAc,YACf,OAAO,MAChB,CAAC,OAAO,oBAAoB;;;oBAiBJ;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE;CAU9D,CAAC"}

package/dist/helpers/paginator.js

@@ -1,28 +0,0 @@
-export const buildPaginator = (fetcher) => (req) => {
-    return {
-        all: async () => {
-            const pages = [];
-            let data;
-            do {
-                data = await fetcher.request({
-                    ...req,
-                    params: { ...req.params, next: data && data?.next },
-                });
-                pages.push(data);
-            } while (data.next);
-            return pages.map((page) => page.results).flat();
-        },
-        first: async () => {
-            return fetcher.request(req);
-        },
-        pass: async (params = {}) => {
-            return fetcher.request({
-                ...req,
-                params: {
-                    ...req.params,
-                    ...params,
-                },
-            });
-        },
-    };
-};