@flexbe/sdk 0.2.32 → 0.2.33

package/dist/esm/client/api-client.js

@@ -1,4 +1,4 @@
-import { NotFoundException, ForbiddenException, BadRequestException, UnauthorizedException, ServerException, TimeoutException, FlexbeAuthType } from '../types';
+import { BadRequestException, FlexbeAuthType, ForbiddenException, NotFoundException, ServerException, TimeoutException, UnauthorizedException } from '../types';
 import { TokenManager } from './token-manager';
 export class ApiClient {
     constructor(config) {
@@ -19,7 +19,7 @@ export class ApiClient {
             if (!token) {
                 throw new Error('No valid bearer token available');
             }
-            headers['Authorization'] = `Bearer ${token}`;
+            headers.Authorization = `Bearer ${token}`;
         }
         return headers;
     }
@@ -54,7 +54,7 @@ export class ApiClient {
                 const defaultError = {
                     message: response.statusText,
                     error: response.statusText,
-                    statusCode: response.status
+                    statusCode: response.status,
                 };
                 const errorData = await response.json().catch(() => defaultError);
                 switch (errorData.statusCode) {
@@ -76,7 +76,7 @@ export class ApiClient {
                             message: errorData.message,
                             error: errorData.error,
                             statusCode: errorData.statusCode,
-                            errors: errorData.errors
+                            errors: errorData.errors,
                         };
                 }
             }
@@ -105,19 +105,19 @@ export class ApiClient {
             throw error;
         }
     }
-    get(url, config) {
+    async get(url, config) {
         return this.request({ ...config, url, method: 'GET' });
     }
-    post(url, data, config) {
+    async post(url, data, config) {
         return this.request({ ...config, url, method: 'POST', body: JSON.stringify(data) });
     }
-    put(url, data, config) {
+    async put(url, data, config) {
         return this.request({ ...config, url, method: 'PUT', body: JSON.stringify(data) });
     }
-    patch(url, data, config) {
+    async patch(url, data, config) {
         return this.request({ ...config, url, method: 'PATCH', body: JSON.stringify(data) });
     }
-    delete(url, config) {
+    async delete(url, config) {
         return this.request({ ...config, url, method: 'DELETE' });
     }
 }

package/dist/esm/client/client.js

@@ -1,7 +1,7 @@
 import { FlexbeAuthType } from '../types';
 import { ApiClient } from './api-client';
-import { SiteApi } from './site-api';
 import { MetaApi } from './meta-api';
+import { SiteApi } from './site-api';
 import { TokenManager } from './token-manager';
 export class FlexbeClient {
     constructor(config) {

package/dist/esm/client/meta-api.js

@@ -8,7 +8,7 @@ export class MetaApi {
      */
     async getSiteLanguages() {
         const response = await this.api.get('/meta/site-languages', {
-            headers: { 'Authorization': '' }
+            headers: { Authorization: '' },
         });
         return response.data;
     }
@@ -18,7 +18,7 @@ export class MetaApi {
      */
     async getUserLanguages() {
         const response = await this.api.get('/meta/user-languages', {
-            headers: { 'Authorization': '' }
+            headers: { Authorization: '' },
         });
         return response.data;
     }
@@ -28,7 +28,7 @@ export class MetaApi {
      */
     async getSiteCurrencies() {
         const response = await this.api.get('/meta/site-currencies', {
-            headers: { 'Authorization': '' }
+            headers: { Authorization: '' },
         });
         return response.data;
     }

package/dist/esm/client/pages.js

@@ -20,11 +20,13 @@ export class Pages {
      * @throws {TimeoutException} When the request times out
      */
     async getPages(params) {
-        const processedParams = params ? {
-            ...params,
-            type: Array.isArray(params.type) ? params.type.join(',') : params.type,
-            status: Array.isArray(params.status) ? params.status.join(',') : params.status
-        } : undefined;
+        const processedParams = params
+            ? {
+                ...params,
+                type: Array.isArray(params.type) ? params.type.join(',') : params.type,
+                status: Array.isArray(params.status) ? params.status.join(',') : params.status,
+            }
+            : undefined;
         const response = await this.api.get(`/sites/${this.siteId}/pages`, { params: processedParams });
         return response.data;
     }
@@ -123,6 +125,7 @@ export class Pages {
      * @param pageId - ID of the page to update
      * @param data - Update parameters including:
      * - status: New status for the page
+     * - versionId: ID of the version to set as current
      * - name: New name for the page (max 150 characters)
      * - uri: New URI for the page (max 255 characters, automatically normalized with leading and trailing slashes)
      * - language: New language for the page
@@ -136,10 +139,9 @@ export class Pages {
      *   - ogTitle: Open Graph title for social sharing (max 200 characters)
      *   - ogDescription: Open Graph description for social sharing (max 1000 characters)
      *   - noindex: Whether to prevent search engine indexing
-     * - grid: Grid configuration for the page
      * @throws {UnauthorizedException} When the API key is invalid or expired
-     * @throws {NotFoundException} When the page is not found
-     * @throws {ForbiddenException} When the page does not belong to the site
+     * @throws {NotFoundException} When the page or version is not found
+     * @throws {ForbiddenException} When the page does not belong to the site or version belongs to a different page
      * @throws {BadRequestException} When the update parameters are invalid
      * @throws {ServerException} When the server encounters an error
      * @throws {TimeoutException} When the request times out
@@ -205,7 +207,7 @@ export class Pages {
      */
     async bulkDeletePages(ids) {
         const response = await this.api.delete(`/sites/${this.siteId}/pages`, {
-            body: JSON.stringify({ ids })
+            body: JSON.stringify({ ids }),
         });
         return response.data;
     }
@@ -239,6 +241,35 @@ export class Pages {
         const response = await this.api.put(`/sites/${this.siteId}/pages/${pageId}/content`, content);
         return response.data;
     }
+    /**
+     * Get list of page history items
+     * @param pageId - ID of the page to get history for
+     * @returns List of page history items
+     * @throws {UnauthorizedException} When the API key is invalid or expired
+     * @throws {NotFoundException} When the page is not found
+     * @throws {ForbiddenException} When the page does not belong to the site
+     * @throws {ServerException} When the server encounters an error
+     * @throws {TimeoutException} When the request times out
+     */
+    async getPageHistory(pageId) {
+        const response = await this.api.get(`/sites/${this.siteId}/pages/${pageId}/history`);
+        return response.data;
+    }
+    /**
+     * Get a specific page history item
+     * @param pageId - ID of the page
+     * @param versionId - ID of the history item to get
+     * @returns The requested page history item with data
+     * @throws {UnauthorizedException} When the API key is invalid or expired
+     * @throws {NotFoundException} When the page or history item is not found
+     * @throws {ForbiddenException} When the page does not belong to the site
+     * @throws {ServerException} When the server encounters an error
+     * @throws {TimeoutException} When the request times out
+     */
+    async getPageHistoryItem(pageId, versionId) {
+        const response = await this.api.get(`/sites/${this.siteId}/pages/${pageId}/history/${versionId}`);
+        return response.data;
+    }
     /**
      * Get list of page versions
      * @param pageId - ID of the page to get versions for
@@ -249,8 +280,8 @@ export class Pages {
      * @throws {ServerException} When the server encounters an error
      * @throws {TimeoutException} When the request times out
      */
-    async getPageHistory(pageId) {
-        const response = await this.api.get(`/sites/${this.siteId}/pages/${pageId}/history`);
+    async getPageVersions(pageId) {
+        const response = await this.api.get(`/sites/${this.siteId}/pages/${pageId}/versions`);
         return response.data;
     }
     /**
@@ -264,8 +295,8 @@ export class Pages {
      * @throws {ServerException} When the server encounters an error
      * @throws {TimeoutException} When the request times out
      */
-    async getPageHistoryItem(pageId, versionId) {
-        const response = await this.api.get(`/sites/${this.siteId}/pages/${pageId}/history/${versionId}`);
+    async getPageVersion(pageId, versionId) {
+        const response = await this.api.get(`/sites/${this.siteId}/pages/${pageId}/versions/${versionId}`);
         return response.data;
     }
 }

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, PageVersionListResponse, PageHistoryItemData } 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;
@@ -97,6 +97,7 @@ export declare class Pages {
      * @param pageId - ID of the page to update
      * @param data - Update parameters including:
      * - status: New status for the page
+     * - versionId: ID of the version to set as current
      * - name: New name for the page (max 150 characters)
      * - uri: New URI for the page (max 255 characters, automatically normalized with leading and trailing slashes)
      * - language: New language for the page
@@ -110,10 +111,9 @@ export declare class Pages {
      *   - ogTitle: Open Graph title for social sharing (max 200 characters)
      *   - ogDescription: Open Graph description for social sharing (max 1000 characters)
      *   - noindex: Whether to prevent search engine indexing
-     * - grid: Grid configuration for the page
      * @throws {UnauthorizedException} When the API key is invalid or expired
-     * @throws {NotFoundException} When the page is not found
-     * @throws {ForbiddenException} When the page does not belong to the site
+     * @throws {NotFoundException} When the page or version is not found
+     * @throws {ForbiddenException} When the page does not belong to the site or version belongs to a different page
      * @throws {BadRequestException} When the update parameters are invalid
      * @throws {ServerException} When the server encounters an error
      * @throws {TimeoutException} When the request times out
@@ -193,6 +193,29 @@ export declare class Pages {
      * @throws {TimeoutException} When the request times out
      */
     updatePageContent(pageId: number, content: Partial<UpdatePageContentParams>): Promise<PageContent>;
+    /**
+     * Get list of page history items
+     * @param pageId - ID of the page to get history for
+     * @returns List of page history items
+     * @throws {UnauthorizedException} When the API key is invalid or expired
+     * @throws {NotFoundException} When the page is not found
+     * @throws {ForbiddenException} When the page does not belong to the site
+     * @throws {ServerException} When the server encounters an error
+     * @throws {TimeoutException} When the request times out
+     */
+    getPageHistory(pageId: number): Promise<PageHistoryListResponse>;
+    /**
+     * Get a specific page history item
+     * @param pageId - ID of the page
+     * @param versionId - ID of the history item to get
+     * @returns The requested page history item with data
+     * @throws {UnauthorizedException} When the API key is invalid or expired
+     * @throws {NotFoundException} When the page or history item is not found
+     * @throws {ForbiddenException} When the page does not belong to the site
+     * @throws {ServerException} When the server encounters an error
+     * @throws {TimeoutException} When the request times out
+     */
+    getPageHistoryItem(pageId: number, versionId: number): Promise<PageHistoryItemData>;
     /**
      * Get list of page versions
      * @param pageId - ID of the page to get versions for
@@ -203,7 +226,7 @@ export declare class Pages {
      * @throws {ServerException} When the server encounters an error
      * @throws {TimeoutException} When the request times out
      */
-    getPageHistory(pageId: number): Promise<PageVersionListResponse>;
+    getPageVersions(pageId: number): Promise<PageVersionListResponse>;
     /**
      * Get a specific page version
      * @param pageId - ID of the page
@@ -215,5 +238,5 @@ export declare class Pages {
      * @throws {ServerException} When the server encounters an error
      * @throws {TimeoutException} When the request times out
      */
-    getPageHistoryItem(pageId: number, versionId: number): Promise<PageHistoryItemData>;
+    getPageVersion(pageId: number, versionId: number): Promise<PageVersionDataResponse>;
 }

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?: {
@@ -45,6 +45,7 @@ export declare enum PageStatus {
 }
 export interface Page {
     id: number;
+    versionId: number | null;
     type: PageType;
     status: PageStatus;
     name: string;
@@ -89,6 +90,7 @@ export interface CreateFolderParams {
 }
 export interface UpdatePageParams {
     status?: PageStatus;
+    versionId?: number;
     name?: string;
     uri?: string;
     language?: string;
@@ -292,10 +294,20 @@ export interface PageHistoryItem {
     createdAt: string;
     selected?: boolean;
 }
-export interface PageVersionListResponse {
+export interface PageHistoryListResponse {
     list: PageHistoryItem[];
 }
 export interface PageHistoryItemData extends PageHistoryItem {
     data: Record<string, unknown>;
 }
+export interface PageVersionItem {
+    id: number;
+    createdAt: string;
+}
+export interface PageVersionListResponse {
+    list: PageVersionItem[];
+}
+export interface PageVersionDataResponse {
+    data: PageContent;
+}
 export {};

package/package.json

@@ -1,67 +1,64 @@
 {
-    "name": "@flexbe/sdk",
-    "version": "0.2.32",
-    "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.33",
+  "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"
+  }
 }