@flashbacktech/flashbackclient 0.1.10 → 0.1.12

package/dist/api/client.d.ts

@@ -2,6 +2,7 @@ import { CreateUnitRequest, CreateUnitResponse, CreateRepoRequest, CreateRepoRes
 import { IApiClient, ProviderType } from './interfaces';
 import { ActivateResponse, DeactivateResponse, LoginBody, LoginResponse, LogoutResponse, OAuth2ResponseDTO, RefreshTokenErrorResponse, RefreshTokenResponse, RegisterBody, RegisterResponse } from './types/auth';
 import { StatsQueryParams, StatsResponse, NodeStatsMinuteResponse, NodeStatsDailyResponse, NodeStatsQueryParams, UnitStatsResponse, RepoStatsResponse, NodeStatsDailyQueryParams } from './types/stats';
+import { NodeInfo } from './types/bridge';
 interface ErrorResponse {
     message?: string;
     [key: string]: any;
@@ -71,5 +72,6 @@ export declare class ApiClient implements IApiClient {
     getUnitStats: (params?: {
         unitId?: string[];
     }) => Promise<UnitStatsResponse>;
+    getNodeInfo: () => Promise<NodeInfo[]>;
 }
 export {};

package/dist/api/client.js

@@ -293,6 +293,9 @@ class ApiClient {
             }
             return this.makeRequest(`unit/stats${queryParams.toString() ? `?${queryParams.toString()}` : ''}`, 'GET', null);
         };
+        this.getNodeInfo = async () => {
+            return this.makeRequest('node', 'GET', null);
+        };
         this.baseURL = baseURL;
         this.headers = {};
         this.debug = false;

package/dist/api/types/bridge.d.ts

@@ -41,4 +41,13 @@ export interface RegisterResponse {
     errorCode?: string;
     errorMessage?: string;
 }
+export interface NodeInfo {
+    ip: string;
+    region: string;
+    version: string;
+    status: string;
+    latencyMs?: number;
+    lastUpdated: string;
+    url: string;
+}
 export {};

package/dist/gcs/oauth2.d.ts

@@ -1,29 +1,25 @@
 import { OAuth2Client } from 'google-auth-library';
-import { ServiceCredentials } from './storage';
-import { GaxiosResponse } from 'gaxios';
 export declare class MockupAuthClient extends OAuth2Client {
     getRequestHeaders(): Promise<{
         Authorization: string;
     }>;
 }
 export declare class FlashbackAuthClient extends OAuth2Client {
-    private authUrl;
-    private creds;
-    private _credentials;
+    private customTokenUri;
+    private serviceCredentials;
     private scopes;
-    constructor(authUrl: string, scopes: string[], credentials: ServiceCredentials);
-    getCredentials(): Promise<{
+    private _credentials;
+    constructor(customTokenUri: string, serviceCredentials: {
         client_email: string;
         private_key: string;
-    }>;
+    }, scopes: string[]);
     getAccessToken(): Promise<{
         token: string | null;
-        res: null;
+        res: any;
     }>;
     getRequestHeaders(): Promise<Record<string, string>>;
-    private ensureValidToken;
-    private fetchToken;
-    request<T = any>(opts: any): Promise<GaxiosResponse<T>>;
     getRequestMetadata(url?: string): Promise<Record<string, string>>;
     authorizeRequest(reqOpts: any): Promise<any>;
+    private ensureValidToken;
+    private fetchToken;
 }

package/dist/gcs/oauth2.js

@@ -15,19 +15,12 @@ class MockupAuthClient extends google_auth_library_1.OAuth2Client {
 }
 exports.MockupAuthClient = MockupAuthClient;
 class FlashbackAuthClient extends google_auth_library_1.OAuth2Client {
-    constructor(authUrl, scopes, credentials) {
+    constructor(customTokenUri, serviceCredentials, scopes) {
         super();
-        this.authUrl = authUrl;
         this._credentials = null;
-        this.creds = credentials;
+        this.customTokenUri = customTokenUri;
+        this.serviceCredentials = serviceCredentials;
         this.scopes = scopes;
-        console.log('FlashbackAuthClient created with URL:', authUrl);
-    }
-    async getCredentials() {
-        return {
-            client_email: this.creds.client_email,
-            private_key: this.creds.private_key,
-        };
     }
     async getAccessToken() {
         await this.ensureValidToken();
@@ -42,44 +35,6 @@ class FlashbackAuthClient extends google_auth_library_1.OAuth2Client {
             Authorization: `Bearer ${this._credentials?.access_token}`,
         };
     }
-    async ensureValidToken() {
-        const now = Date.now();
-        if (!this._credentials?.access_token ||
-            !this._credentials?.expiry_date ||
-            now >= this._credentials.expiry_date) {
-            await this.fetchToken();
-        }
-    }
-    async fetchToken() {
-        const response = await axios_1.default.post(this.authUrl, {
-            client_email: this.creds.client_email,
-            private_key: this.creds.private_key,
-            scopes: this.scopes,
-        });
-        const { access_token, expires_in } = response.data;
-        this._credentials = {
-            access_token,
-            expiry_date: Date.now() + expires_in * 1000 - 10000,
-        };
-    }
-    async request(opts) {
-        await this.ensureValidToken();
-        const headers = {
-            ...(opts.headers || {}),
-            Authorization: `Bearer ${this._credentials?.access_token}`,
-        };
-        const response = await axios_1.default.request({
-            ...opts,
-            headers,
-        });
-        return {
-            config: opts,
-            data: response.data,
-            headers: response.headers,
-            status: response.status,
-            statusText: response.statusText,
-        };
-    }
     async getRequestMetadata(url) {
         await this.ensureValidToken();
         return {
@@ -96,5 +51,51 @@ class FlashbackAuthClient extends google_auth_library_1.OAuth2Client {
             },
         };
     }
+    async ensureValidToken() {
+        const now = Date.now();
+        if (!this._credentials?.access_token ||
+            !this._credentials?.expiry_date ||
+            now >= this._credentials.expiry_date) {
+            await this.fetchToken();
+        }
+    }
+    async fetchToken() {
+        // Create JWT assertion like the Python SDK
+        const now = Math.floor(Date.now() / 1000);
+        const header = {
+            alg: 'RS256',
+            typ: 'JWT',
+        };
+        const payload = {
+            iss: this.serviceCredentials.client_email,
+            sub: this.serviceCredentials.client_email,
+            aud: 'https://oauth2.googleapis.com/token',
+            exp: now + 3600,
+            iat: now,
+            scope: this.scopes.join(' '),
+        };
+        const encodedHeader = Buffer.from(JSON.stringify(header)).toString('base64url');
+        const encodedPayload = Buffer.from(JSON.stringify(payload)).toString('base64url');
+        const signatureInput = `${encodedHeader}.${encodedPayload}`;
+        const crypto = require('crypto');
+        const sign = crypto.createSign('RSA-SHA256');
+        sign.update(signatureInput);
+        const signature = sign.sign(this.serviceCredentials.private_key, 'base64url');
+        const assertion = `${signatureInput}.${signature}`;
+        // Request token from custom endpoint
+        const formData = new URLSearchParams();
+        formData.append('grant_type', 'urn:ietf:params:oauth:grant-type:jwt-bearer');
+        formData.append('assertion', assertion);
+        const response = await axios_1.default.post(this.customTokenUri, formData, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+            },
+        });
+        this._credentials = {
+            access_token: response.data.access_token,
+            expiry_date: (now + response.data.expires_in) * 1000, // Convert to milliseconds
+            token_type: response.data.token_type || 'Bearer',
+        };
+    }
 }
 exports.FlashbackAuthClient = FlashbackAuthClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flashbacktech/flashbackclient",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"