@flashbacktech/flashbackclient 0.0.93 → 0.0.95

package/dist/api/client.d.ts

@@ -1,6 +1,7 @@
 import { CreateUnitRequest, CreateUnitResponse, CreateRepoRequest, CreateRepoResponse, StorageUnit, CreateRepoKeyRequest, CreateRepoKeyResponse, GetUnitsResponse, GetReposResponse, GetRepoKeysResponse, UpdateUnitRequest, UpdateUnitResponse, ActionResponse, UpdateRepoRequest, UpdateRepoResponse, UpdateRepoKeyRequest, UpdateRepoKeyResponse, ValidateUnitRequest, ValidateUnitResponse, ValidateRepoUnitsRequest, ValidateRepoUnitsResponse, StorageUnitStatusResponse, GetUnitNodeStatsResponse, GetUnitNodeStatsRequest } from './types/storage';
 import { IApiClient, ProviderType } from './interfaces';
 import { ActivateResponse, DeactivateResponse, LoginBody, LoginResponse, LogoutResponse, OAuth2ResponseDTO, RefreshTokenErrorResponse, RefreshTokenResponse, RegisterBody, RegisterResponse } from './types/auth';
+import { StatsQueryParams, StatsResponse } from './types/stats';
 interface ErrorResponse {
     message?: string;
     [key: string]: any;
@@ -59,5 +60,8 @@ export declare class ApiClient implements IApiClient {
     userLogout: (refreshToken: string) => Promise<LogoutResponse>;
     userActivate: () => Promise<ActivateResponse>;
     userDeactivate: () => Promise<DeactivateResponse>;
+    private validateDateRange;
+    getDailyStats: (params: StatsQueryParams) => Promise<StatsResponse>;
+    getMinuteStats: (params: StatsQueryParams) => Promise<StatsResponse>;
 }
 export {};

package/dist/api/client.js

@@ -218,9 +218,47 @@ class ApiClient {
         this.userDeactivate = async () => {
             return this.makeRequest('user/deactivate', 'POST', null);
         };
+        this.getDailyStats = async (params) => {
+            this.validateDateRange(params.startDate, params.endDate);
+            const queryParams = new URLSearchParams();
+            if (params.startDate) {
+                queryParams.append('startDate', params.startDate.toISOString());
+            }
+            if (params.endDate) {
+                queryParams.append('endDate', params.endDate.toISOString());
+            }
+            if (params.repoId && params.repoId.length > 0)
+                queryParams.append('repoId', params.repoId.join(','));
+            if (params.unitId && params.unitId.length > 0)
+                queryParams.append('unitId', params.unitId.join(','));
+            return this.makeRequest(`stats/daily?${queryParams.toString()}`, 'GET', null);
+        };
+        this.getMinuteStats = async (params) => {
+            this.validateDateRange(params.startDate, params.endDate);
+            const queryParams = new URLSearchParams();
+            if (params.startDate) {
+                queryParams.append('startDate', params.startDate.toISOString());
+            }
+            if (params.endDate) {
+                queryParams.append('endDate', params.endDate.toISOString());
+            }
+            if (params.repoId && params.repoId.length > 0)
+                queryParams.append('repoId', params.repoId.join(','));
+            if (params.unitId && params.unitId.length > 0)
+                queryParams.append('unitId', params.unitId.join(','));
+            return this.makeRequest(`stats/minute?${queryParams.toString()}`, 'GET', null);
+        };
         this.baseURL = baseURL;
         this.headers = {};
         this.debug = false;
     }
+    ////// Stats API
+    validateDateRange(startDate, endDate) {
+        if (startDate && endDate) {
+            if (startDate > endDate) {
+                throw new Error('startDate cannot be greater than endDate');
+            }
+        }
+    }
 }
 exports.ApiClient = ApiClient;

package/dist/api/interfaces.d.ts

@@ -1,5 +1,6 @@
 import { StorageUnit, CreateUnitRequest, CreateUnitResponse, CreateRepoRequest, CreateRepoResponse, CreateRepoKeyRequest, CreateRepoKeyResponse, GetUnitsResponse, GetReposResponse, GetRepoKeysResponse, UpdateUnitRequest, UpdateUnitResponse, ActionResponse, UpdateRepoResponse, UpdateRepoRequest, UpdateRepoKeyRequest, UpdateRepoKeyResponse, ValidateUnitRequest, ValidateUnitResponse, ValidateRepoUnitsRequest, ValidateRepoUnitsResponse, GetUnitNodeStatsRequest, GetUnitNodeStatsResponse } from "./types/storage";
 import { RegisterBody, LoginBody, RegisterResponse, LoginResponse, LogoutResponse, ActivateResponse, DeactivateResponse, RefreshTokenResponse, RefreshTokenErrorResponse } from "./types/auth";
+import { StatsQueryParams, StatsResponse } from "./types/stats";
 export declare enum ProviderType {
     GOOGLE = "GOOGLE",
     GITHUB = "GITHUB",
@@ -31,4 +32,6 @@ export interface IApiClient {
     userLogout(refreshToken: string): Promise<LogoutResponse>;
     userActivate(): Promise<ActivateResponse>;
     userDeactivate(): Promise<DeactivateResponse>;
+    getDailyStats(params: StatsQueryParams): Promise<StatsResponse>;
+    getMinuteStats(params: StatsQueryParams): Promise<StatsResponse>;
 }

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

@@ -0,0 +1,20 @@
+export interface StatsQueryParams {
+    startDate?: Date;
+    endDate?: Date;
+    repoId?: string[];
+    unitId?: string[];
+}
+export interface StatsResponse {
+    success: boolean;
+    data: StatsData[];
+    message?: string;
+}
+export interface StatsData {
+    timestamp: number;
+    repoId: string;
+    unitId: string;
+    upl_bytes: bigint;
+    dwl_bytes: bigint;
+    size_change: bigint;
+    latency_ms: number;
+}

package/dist/api/types/stats.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/gcs/storage.d.ts

@@ -18,6 +18,8 @@ export interface SignedUrlOptions {
 export declare class FlashbackGCSStorage extends Storage {
     protected credentials: ServiceCredentials;
     private debug;
+    apiEndpoint: string;
+    private currentUploadContentType;
     constructor(opts: FlashbackStorageOptions);
     cleanup(): void;
     bucket(name: string): import("@google-cloud/storage").Bucket;

package/dist/gcs/storage.js

@@ -7,14 +7,18 @@ exports.FlashbackGCSStorage = void 0;
 const storage_1 = require("@google-cloud/storage");
 const oauth2_1 = require("./oauth2");
 const crypto_1 = __importDefault(require("crypto"));
+const node_fetch_1 = __importDefault(require("node-fetch"));
 const originalRequest = require('gaxios').instance.request;
+const originalFetch = node_fetch_1.default;
 class FlashbackGCSStorage extends storage_1.Storage {
     constructor(opts) {
         const { credentials, apiEndpoint = 'https://gcs-us-east-1-gcp.flashback.tech', tokenScopes = ['READ', 'WRITE'], ...rest } = opts;
-        const authClient = new oauth2_1.FlashbackAuthClient(apiEndpoint + '/token', tokenScopes, credentials);
+        // Ensure the endpoint doesn't have a trailing slash
+        const cleanEndpoint = apiEndpoint.replace(/\/$/, '');
+        const authClient = new oauth2_1.FlashbackAuthClient(cleanEndpoint + '/token', tokenScopes, credentials);
         super({
             ...rest,
-            apiEndpoint,
+            apiEndpoint: cleanEndpoint,
             authClient,
             useAuthWithCustomEndpoint: true,
             retryOptions: {
@@ -24,6 +28,7 @@ class FlashbackGCSStorage extends storage_1.Storage {
         });
         this.debug = false;
         this.credentials = credentials;
+        this.apiEndpoint = cleanEndpoint;
         // Intercept Gaxios instance creation
         require('gaxios').instance.request = async function (opts) {
             // Add auth headers to all requests
@@ -32,15 +37,45 @@ class FlashbackGCSStorage extends storage_1.Storage {
                 ...(opts.headers || {}),
                 ...headers,
             };
+            // Ensure the base URL is used and properly handle query parameters
+            if (!opts.url.startsWith('http')) {
+                // Remove any trailing question marks
+                const cleanUrl = opts.url.replace(/\?+$/, '');
+                opts.url = `${cleanEndpoint}${cleanUrl}`;
+            }
             return originalRequest.call(this, opts);
         };
+        // Intercept node-fetch
+        global.fetch = async (url, options = {}) => {
+            const headers = await authClient.getRequestHeaders();
+            const finalUrl = url.startsWith('http') ? url : `${cleanEndpoint}${url}`;
+            return originalFetch(finalUrl, {
+                ...options,
+                headers: {
+                    ...(options.headers || {}),
+                    ...headers,
+                },
+            });
+        };
     }
     cleanup() {
         require('gaxios').instance.request = originalRequest;
+        global.fetch = originalFetch;
     }
     // Override the bucket method to ensure we pass the auth client
     bucket(name) {
-        return super.bucket(name);
+        const bucket = super.bucket(name);
+        const originalUpload = bucket.upload.bind(bucket);
+        bucket.upload = async (filePath, options) => {
+            this.currentUploadContentType = options?.contentType;
+            try {
+                return await originalUpload(filePath, options);
+            }
+            finally {
+                this.currentUploadContentType = undefined;
+            }
+        };
+        return bucket;
     }
     setDebug(debug) {
         this.debug = debug;
@@ -71,12 +106,13 @@ class FlashbackGCSStorage extends storage_1.Storage {
         if (contentType) {
             extensionHeaders['content-type'] = contentType;
         }
-        const signedHeaders = Object.keys(extensionHeaders)
+        // Sort headers once and use the same order for both signedHeaders and canonicalHeaders
+        const sortedHeaderKeys = Object.keys(extensionHeaders)
             .map(header => header.toLowerCase())
-            .sort()
-            .join(';');
-        const canonicalHeaders = Object.entries(extensionHeaders)
-            .map(([key, value]) => `${key.toLowerCase()}:${value}`)
+            .sort();
+        const signedHeaders = sortedHeaderKeys.join(';');
+        const canonicalHeaders = sortedHeaderKeys
+            .map(key => `${key}:${extensionHeaders[key.toLowerCase()]}`)
             .join('\n') + '\n';
         const datestamp = accessibleAt.toISOString().split('T')[0];
         const credentialScope = `${datestamp}/auto/storage/goog4_request`;
@@ -120,7 +156,8 @@ class FlashbackGCSStorage extends storage_1.Storage {
             credentialScope,
             crypto_1.default.createHash('sha256').update(canonicalRequest).digest('hex'),
         ].join('\n');
-        this.doLog('String to Sign:', stringToSign);
+        const canonicalRequestHex = Buffer.from(canonicalRequest).toString('hex');
+        this.doLog('String to Sign:', stringToSign, canonicalRequestHex);
         const sign = crypto_1.default.createSign('RSA-SHA256');
         sign.update(stringToSign);
         const signature = sign.sign(this.credentials.private_key, 'hex');

package/dist/utils/blob.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Generate a 64 bytes base64 block ID string.
+ *
+ * @export
+ * @param {number} blockIndex
+ * @returns {string}
+ */
+export declare function generateBlockID(blockIDPrefix: string, blockIndex: number): string;

package/dist/utils/blob.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateBlockID = generateBlockID;
+/**
+ * Generate a 64 bytes base64 block ID string.
+ *
+ * @export
+ * @param {number} blockIndex
+ * @returns {string}
+ */
+function generateBlockID(blockIDPrefix, blockIndex) {
+    // To generate a 64 bytes base64 string, source string should be 48
+    const maxSourceStringLength = 48;
+    // A blob can have a maximum of 100,000 uncommitted blocks at any given time
+    const maxBlockIndexLength = 6;
+    const maxAllowedBlockIDPrefixLength = maxSourceStringLength - maxBlockIndexLength;
+    if (blockIDPrefix.length > maxAllowedBlockIDPrefixLength) {
+        blockIDPrefix = blockIDPrefix.slice(0, maxAllowedBlockIDPrefixLength);
+    }
+    const res = blockIDPrefix +
+        blockIndex.toString().padStart(maxSourceStringLength - blockIDPrefix.length, "0");
+    return Buffer.from(res).toString("base64");
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flashbacktech/flashbackclient",
-  "version": "0.0.93",
+  "version": "0.0.95",
   "publishConfig": {
     "access": "public"
   },
@@ -24,9 +24,9 @@
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-sts": "^3.777.0",
+    "@google-cloud/storage": "^7.15.0",
     "@stellar/stellar-sdk": "^13.0.0",
     "formdata-node": "^6.0.3",
-    "@google-cloud/storage": "^7.15.0",
     "google-auth-library": "^9.15.1"
   },
   "bin": {
@@ -55,6 +55,7 @@
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.777.0",
     "@aws-sdk/s3-request-presigner": "^3.782.0",
+    "@azure/storage-blob": "^12.27.0",
     "@eslint/js": "^8.56.0",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.10.1",