@flexbe/sdk 0.2.34 → 0.2.35

package/dist/esm/client/token-manager.js

@@ -4,6 +4,7 @@ const TOKEN_REFRESH_THRESHOLD = 5 * 60 * 1000; // update token 5 minutes before
 export class TokenManager {
     constructor() {
         this.tokenPromise = null;
+        this.isRevoking = false;
     }
     static getInstance() {
         if (!TokenManager.instance) {
@@ -18,6 +19,9 @@ export class TokenManager {
         return TokenManager.instance;
     }
     async getToken() {
+        if (this.isRevoking) {
+            return null;
+        }
         const token = this.getStoredToken();
         if (token && token.expiresAt > Date.now()) {
             // TODO check if token expire less that 1 minute
@@ -32,10 +36,14 @@ export class TokenManager {
         return retrievedToken?.accessToken ?? null;
     }
     async revokeToken() {
+        this.isRevoking = true;
         const token = this.getStoredToken();
-        this.clearToken();
-        if (!token)
+        if (!token) {
+            this.isRevoking = false;
             return;
+        }
+        // Optimistic token cleanup
+        this.clearToken();
         try {
             const controller = new AbortController();
             const timeoutId = setTimeout(() => controller.abort(), 30000);
@@ -43,7 +51,7 @@ export class TokenManager {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
-                    'Authorization': `Bearer ${token.accessToken}`
+                    Authorization: `Bearer ${token.accessToken}`,
                 },
                 body: JSON.stringify({ token: token.accessToken }),
                 credentials: 'include',
@@ -54,10 +62,16 @@ export class TokenManager {
         catch (error) {
             console.error('Failed to revoke token:', error);
         }
+        finally {
+            // Finally cleanup the token
+            this.clearToken();
+            this.isRevoking = false;
+        }
     }
     getStoredToken() {
-        if (typeof window === 'undefined')
+        if (typeof window === 'undefined') {
             return null;
+        }
         const storedToken = localStorage.getItem(TOKEN_STORAGE_KEY);
         if (!storedToken) {
             return null;
@@ -87,28 +101,23 @@ export class TokenManager {
     async doRetrieveToken() {
         const controller = new AbortController();
         const timeoutId = setTimeout(() => controller.abort(), 30000);
-        try {
-            const response = await fetch('/oauth/token', {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ grant_type: 'client_credentials' }),
-                credentials: 'include',
-                signal: controller.signal,
-            });
-            clearTimeout(timeoutId);
-            if (!response.ok) {
-                const errorData = await response.json().catch(() => ({ message: response.statusText }));
-                if (response.status === 401) {
-                    throw new UnauthorizedException(errorData.message || response.statusText);
-                }
-                throw new Error(errorData.message || response.statusText);
+        const response = await fetch('/oauth/token', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ grant_type: 'client_credentials' }),
+            credentials: 'include',
+            signal: controller.signal,
+        });
+        clearTimeout(timeoutId);
+        if (!response.ok) {
+            const errorData = await response.json().catch(() => ({ message: response.statusText }));
+            if (response.status === 401) {
+                throw new UnauthorizedException(errorData.message || response.statusText);
             }
-            const data = await response.json();
-            this.setToken(data);
-        }
-        catch (error) {
-            throw error;
+            throw new Error(errorData.message || response.statusText);
         }
+        const data = await response.json();
+        this.setToken(data);
     }
     setToken(tokenResponse) {
         const expiresAt = this.getExpirationFromToken(tokenResponse.accessToken);

package/dist/types/client/api-client.d.ts

@@ -1,4 +1,4 @@
-import { FlexbeConfig, FlexbeResponse } from '../types';
+import type { FlexbeConfig, FlexbeResponse } from '../types';
 export declare class ApiClient {
     private readonly config;
     private readonly tokenManager;

package/dist/types/client/client.d.ts

@@ -1,6 +1,6 @@
-import { FlexbeConfig } from '../types';
-import { SiteApi } from './site-api';
 import { MetaApi } from './meta-api';
+import { SiteApi } from './site-api';
+import type { FlexbeConfig } from '../types';
 export declare class FlexbeClient {
     private readonly config;
     private readonly api;

package/dist/types/client/meta-api.d.ts

@@ -1,5 +1,5 @@
-import { ApiClient } from './api-client';
-import { SiteCurrency, SiteLanguage, UserLanguage } from '../types/meta';
+import type { ApiClient } from './api-client';
+import type { SiteCurrency, SiteLanguage, UserLanguage } from '../types/meta';
 export declare class MetaApi {
     private readonly api;
     constructor(api: ApiClient);

package/dist/types/client/pages.d.ts

@@ -1,5 +1,5 @@
-import { Page, GetPagesParams, PageListResponse, PageFolder, PageFolderListResponse, UpdateFolderParams, CreateFolderParams, UpdatePageParams, BulkUpdatePageItem, BulkUpdateResponse, BulkUpdateFolderItem, BulkUpdateFolderResponse, BulkDeleteResponse, PageContent, UpdatePageContentParams, PageHistoryListResponse, PageHistoryItemData, PageVersionListResponse, PageVersionDataResponse } from '../types/pages';
-import { ApiClient } from './api-client';
+import type { ApiClient } from './api-client';
+import type { BulkDeleteResponse, BulkUpdateFolderItem, BulkUpdateFolderResponse, BulkUpdatePageItem, BulkUpdateResponse, CreateFolderParams, GetPagesParams, Page, PageContent, PageFolder, PageFolderListResponse, PageHistoryItemData, PageHistoryListResponse, PageListResponse, PageVersionDataResponse, PageVersionListResponse, UpdateFolderParams, UpdatePageContentParams, UpdatePageParams } from '../types/pages';
 export declare class Pages {
     private readonly api;
     private readonly siteId;

package/dist/types/client/site-api.d.ts

@@ -1,6 +1,6 @@
-import { ApiClient } from './api-client';
 import { Pages } from './pages';
 import { Stat } from './stat';
+import type { ApiClient } from './api-client';
 export declare class SiteApi {
     readonly pages: Pages;
     readonly stat: Stat;

package/dist/types/client/stat.d.ts

@@ -1,5 +1,5 @@
-import { ApiClient } from './api-client';
-import { AbTest } from '../types/stat';
+import type { ApiClient } from './api-client';
+import type { AbTest } from '../types/stat';
 export declare class Stat {
     private readonly api;
     private readonly siteId;

package/dist/types/client/token-manager.d.ts

@@ -1,6 +1,7 @@
 export declare class TokenManager {
     private static instance;
     private tokenPromise;
+    private isRevoking;
     static getInstance(): TokenManager;
     getToken(): Promise<string | null>;
     revokeToken(): Promise<void>;

package/dist/types/types/pages.d.ts

@@ -1,4 +1,4 @@
-import { FlexbeBulkError, Pagination } from './index';
+import type { FlexbeBulkError, Pagination } from './index';
 export interface GridConfig {
     color?: string;
     desktop?: {

package/package.json

@@ -1,67 +1,64 @@
 {
-    "name": "@flexbe/sdk",
-    "version": "0.2.34",
-    "description": "TypeScript SDK for Flexbe API",
-    "main": "dist/cjs/index.js",
-    "module": "dist/esm/index.js",
-    "types": "dist/types/index.d.ts",
-    "browser": "dist/browser/index.js",
-    "exports": {
-        ".": {
-            "import": "./dist/esm/index.js",
-            "require": "./dist/cjs/index.js",
-            "types": "./dist/types/index.d.ts"
-        }
-    },
-    "scripts": {
-        "build": "npm run build:esm && npm run build:cjs && npm run build:browser",
-        "build:esm": "tsc -p tsconfig.esm.json",
-        "build:cjs": "tsc -p tsconfig.cjs.json",
-        "build:browser": "tsc -p tsconfig.browser.json",
-        "dev": "tsc -p tsconfig.esm.json --watch",
-        "test": "dotenv -e test/.env.test jest",
-        "lint": "eslint src --ext .ts",
-        "format": "prettier --write \"src/**/*.ts\"",
-        "prepare": "npm run build",
-        "prepublishOnly": "npm test && npm run lint"
-    },
-    "keywords": [
-        "flexbe",
-        "sdk",
-        "typescript",
-        "api-client"
-    ],
-    "author": "Flexbe",
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/flexbe/sdk-ts.git"
-    },
-    "bugs": {
-        "url": "https://github.com/flexbe/sdk-ts/issues"
-    },
-    "homepage": "https://github.com/flexbe/sdk-ts#readme",
-    "dependencies": {},
-    "devDependencies": {
-        "@types/jest": "^29.5.12",
-        "@types/node": "^20.11.19",
-        "@typescript-eslint/eslint-plugin": "^7.0.1",
-        "@typescript-eslint/parser": "^7.0.1",
-        "dotenv-cli": "^7.4.1",
-        "eslint": "^8.56.0",
-        "jest": "^29.7.0",
-        "prettier": "^3.2.5",
-        "ts-jest": "^29.1.2",
-        "typescript": "~5.5.0"
-    },
-    "files": [
-        "dist",
-        "README.md"
-    ],
-    "engines": {
-        "node": ">=16.0.0"
-    },
-    "publishConfig": {
-        "access": "public"
+  "name": "@flexbe/sdk",
+  "version": "0.2.35",
+  "description": "TypeScript SDK for Flexbe API",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
+  "types": "dist/types/index.d.ts",
+  "browser": "dist/browser/index.js",
+  "exports": {
+    ".": {
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js",
+      "types": "./dist/types/index.d.ts"
     }
+  },
+  "scripts": {
+    "build": "npm run build:esm && npm run build:cjs && npm run build:browser",
+    "build:esm": "tsc -p tsconfig.esm.json",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
+    "build:browser": "tsc -p tsconfig.browser.json",
+    "dev": "tsc -p tsconfig.esm.json --watch",
+    "test": "dotenv -e test/.env.test jest",
+    "lint": "eslint src --ext .ts",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "prepare": "npm run build",
+    "prepublishOnly_": "npm test && npm run lint"
+  },
+  "keywords": [
+    "flexbe",
+    "sdk",
+    "typescript",
+    "api-client"
+  ],
+  "author": "Flexbe",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/flexbe/sdk-ts.git"
+  },
+  "bugs": {
+    "url": "https://github.com/flexbe/sdk-ts/issues"
+  },
+  "homepage": "https://github.com/flexbe/sdk-ts#readme",
+  "devDependencies": {
+    "@flexbe/eslint-config": "^1.0.7",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.11.19",
+    "dotenv-cli": "^7.4.1",
+    "eslint": "^9.26.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.2",
+    "typescript": "~5.5.0"
+  },
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
 }

package/dist/browser/client/auth.js

@@ -1,74 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { FlexbeAuthType } from '../types';
-import { TokenManager } from './token-manager';
-export class FlexbeAuth {
-    constructor(config) {
-        this.initialized = false;
-        this.initializationPromise = null;
-        this.config = config;
-        this.tokenManager = TokenManager.getInstance();
-        if (this.config.authType === FlexbeAuthType.BEARER) {
-            // Start initialization but don't wait for it
-            this.initializationPromise = this.initialize();
-        }
-        else {
-            this.initialized = true;
-        }
-    }
-    initialize() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const token = yield this.tokenManager.getToken();
-                this.initialized = !!token;
-            }
-            catch (error) {
-                console.error('Failed to initialize auth:', error);
-                this.initialized = false;
-            }
-            finally {
-                this.initializationPromise = null;
-            }
-        });
-    }
-    ensureInitialized() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.config.authType !== FlexbeAuthType.BEARER || this.initialized) {
-                return;
-            }
-            // If initialization is in progress, wait for it
-            if (this.initializationPromise) {
-                yield this.initializationPromise;
-                return;
-            }
-            // If not initialized and no initialization in progress, start one
-            yield this.initialize();
-        });
-    }
-    getAuthHeaders() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.ensureInitialized();
-            const headers = {
-                'Content-Type': 'application/json',
-            };
-            if (this.config.authType === FlexbeAuthType.API_KEY) {
-                headers['x-api-key'] = this.config.apiKey;
-            }
-            else if (this.config.authType === FlexbeAuthType.BEARER) {
-                const token = yield this.tokenManager.getToken();
-                if (!token) {
-                    throw new Error('No valid bearer token available');
-                }
-                headers['Authorization'] = `Bearer ${token}`;
-            }
-            return headers;
-        });
-    }
-}

package/dist/cjs/client/auth.js

@@ -1,63 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FlexbeAuth = void 0;
-const types_1 = require("../types");
-const token_manager_1 = require("./token-manager");
-class FlexbeAuth {
-    constructor(config) {
-        this.initialized = false;
-        this.initializationPromise = null;
-        this.config = config;
-        this.tokenManager = token_manager_1.TokenManager.getInstance();
-        if (this.config.authType === types_1.FlexbeAuthType.BEARER) {
-            // Start initialization but don't wait for it
-            this.initializationPromise = this.initialize();
-        }
-        else {
-            this.initialized = true;
-        }
-    }
-    async initialize() {
-        try {
-            const token = await this.tokenManager.getToken();
-            this.initialized = !!token;
-        }
-        catch (error) {
-            console.error('Failed to initialize auth:', error);
-            this.initialized = false;
-        }
-        finally {
-            this.initializationPromise = null;
-        }
-    }
-    async ensureInitialized() {
-        if (this.config.authType !== types_1.FlexbeAuthType.BEARER || this.initialized) {
-            return;
-        }
-        // If initialization is in progress, wait for it
-        if (this.initializationPromise) {
-            await this.initializationPromise;
-            return;
-        }
-        // If not initialized and no initialization in progress, start one
-        await this.initialize();
-    }
-    async getAuthHeaders() {
-        await this.ensureInitialized();
-        const headers = {
-            'Content-Type': 'application/json',
-        };
-        if (this.config.authType === types_1.FlexbeAuthType.API_KEY) {
-            headers['x-api-key'] = this.config.apiKey;
-        }
-        else if (this.config.authType === types_1.FlexbeAuthType.BEARER) {
-            const token = await this.tokenManager.getToken();
-            if (!token) {
-                throw new Error('No valid bearer token available');
-            }
-            headers['Authorization'] = `Bearer ${token}`;
-        }
-        return headers;
-    }
-}
-exports.FlexbeAuth = FlexbeAuth;

package/dist/client/flexbe-client.d.ts

@@ -1,13 +0,0 @@
-import { AxiosRequestConfig } from 'axios';
-import { FlexbeConfig, FlexbeResponse } from '../types';
-export declare class FlexbeClient {
-    private readonly client;
-    private readonly config;
-    constructor(config: FlexbeConfig);
-    private setupInterceptors;
-    protected request<T>(config: AxiosRequestConfig): Promise<FlexbeResponse<T>>;
-    protected get<T>(url: string, config?: AxiosRequestConfig): Promise<FlexbeResponse<T>>;
-    protected post<T>(url: string, data?: unknown, config?: AxiosRequestConfig): Promise<FlexbeResponse<T>>;
-    protected put<T>(url: string, data?: unknown, config?: AxiosRequestConfig): Promise<FlexbeResponse<T>>;
-    protected delete<T>(url: string, config?: AxiosRequestConfig): Promise<FlexbeResponse<T>>;
-}

package/dist/client/flexbe-client.js

@@ -1,62 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FlexbeClient = void 0;
-const axios_1 = __importDefault(require("axios"));
-class FlexbeClient {
-    constructor(config) {
-        this.config = {
-            baseUrl: config.baseUrl || 'https://api.flexbe.com',
-            timeout: config.timeout || 30000,
-            ...config,
-        };
-        this.client = axios_1.default.create({
-            baseURL: this.config.baseUrl,
-            timeout: this.config.timeout,
-            headers: {
-                'Authorization': `Bearer ${this.config.apiKey}`,
-                'Content-Type': 'application/json',
-            },
-        });
-        this.setupInterceptors();
-    }
-    setupInterceptors() {
-        this.client.interceptors.response.use((response) => response, (error) => {
-            const flexbeError = {
-                message: error.response?.data?.message || error.message,
-                code: error.response?.data?.code,
-                status: error.response?.status,
-                details: error.response?.data?.details,
-            };
-            return Promise.reject(flexbeError);
-        });
-    }
-    async request(config) {
-        try {
-            const response = await this.client.request(config);
-            return {
-                data: response.data,
-                status: response.status,
-                statusText: response.statusText,
-            };
-        }
-        catch (error) {
-            throw error;
-        }
-    }
-    get(url, config) {
-        return this.request({ ...config, method: 'GET', url });
-    }
-    post(url, data, config) {
-        return this.request({ ...config, method: 'POST', url, data });
-    }
-    put(url, data, config) {
-        return this.request({ ...config, method: 'PUT', url, data });
-    }
-    delete(url, config) {
-        return this.request({ ...config, method: 'DELETE', url });
-    }
-}
-exports.FlexbeClient = FlexbeClient;

package/dist/esm/client/auth.js

@@ -1,59 +0,0 @@
-import { FlexbeAuthType } from '../types';
-import { TokenManager } from './token-manager';
-export class FlexbeAuth {
-    constructor(config) {
-        this.initialized = false;
-        this.initializationPromise = null;
-        this.config = config;
-        this.tokenManager = TokenManager.getInstance();
-        if (this.config.authType === FlexbeAuthType.BEARER) {
-            // Start initialization but don't wait for it
-            this.initializationPromise = this.initialize();
-        }
-        else {
-            this.initialized = true;
-        }
-    }
-    async initialize() {
-        try {
-            const token = await this.tokenManager.getToken();
-            this.initialized = !!token;
-        }
-        catch (error) {
-            console.error('Failed to initialize auth:', error);
-            this.initialized = false;
-        }
-        finally {
-            this.initializationPromise = null;
-        }
-    }
-    async ensureInitialized() {
-        if (this.config.authType !== FlexbeAuthType.BEARER || this.initialized) {
-            return;
-        }
-        // If initialization is in progress, wait for it
-        if (this.initializationPromise) {
-            await this.initializationPromise;
-            return;
-        }
-        // If not initialized and no initialization in progress, start one
-        await this.initialize();
-    }
-    async getAuthHeaders() {
-        await this.ensureInitialized();
-        const headers = {
-            'Content-Type': 'application/json',
-        };
-        if (this.config.authType === FlexbeAuthType.API_KEY) {
-            headers['x-api-key'] = this.config.apiKey;
-        }
-        else if (this.config.authType === FlexbeAuthType.BEARER) {
-            const token = await this.tokenManager.getToken();
-            if (!token) {
-                throw new Error('No valid bearer token available');
-            }
-            headers['Authorization'] = `Bearer ${token}`;
-        }
-        return headers;
-    }
-}

package/dist/index.d.ts

@@ -1,2 +0,0 @@
-export * from './types';
-export * from './client/flexbe-client';

package/dist/index.js

@@ -1,18 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./types"), exports);
-__exportStar(require("./client/flexbe-client"), exports);

package/dist/src/client/flexbe-client.d.ts

@@ -1,20 +0,0 @@
-import { AxiosRequestConfig } from 'axios';
-import { FlexbeConfig, FlexbeResponse } from '../types';
-import { PagesClient } from './pages-client';
-export declare class FlexbeClient {
-    private readonly client;
-    private readonly config;
-    readonly pages: PagesClient;
-    constructor(config?: Partial<FlexbeConfig>);
-    private setupInterceptors;
-    private request;
-    private get;
-    private post;
-    private put;
-    private delete;
-    private getSiteUrl;
-    sitesGet<T>(path: string, config?: AxiosRequestConfig): Promise<FlexbeResponse<T>>;
-    sitesPost<T>(path: string, data?: unknown, config?: AxiosRequestConfig): Promise<FlexbeResponse<T>>;
-    sitesPut<T>(path: string, data?: unknown, config?: AxiosRequestConfig): Promise<FlexbeResponse<T>>;
-    sitesDelete<T>(path: string, config?: AxiosRequestConfig): Promise<FlexbeResponse<T>>;
-}