macrocosmos 1.2.0 → 1.2.2

package/dist/lib/BaseClient.d.ts

@@ -0,0 +1,46 @@
+export interface BaseClientOptions {
+    apiKey?: string;
+    baseURL?: string;
+    appName?: string;
+    secure?: boolean;
+    userId?: string;
+}
+/**
+ * Base client class that provides common functionality for all clients
+ */
+export declare abstract class BaseClient {
+    protected apiKey: string;
+    protected baseURL: string;
+    protected appName: string;
+    protected secure: boolean;
+    protected userId: string;
+    constructor(options: BaseClientOptions);
+    /**
+     * Get the API key for authentication
+     */
+    protected getApiKey(): string;
+    /**
+     * Get the base URL for the client
+     */
+    protected getBaseURL(): string;
+    /**
+     * Get the app name for the client
+     */
+    protected getAppName(): string;
+    /**
+     * Get whether the client is using secure connections
+     */
+    protected isSecure(): boolean;
+    /**
+     * Get the client name
+     */
+    protected getClientName(): string;
+    /**
+     * Get the client version
+     */
+    protected getClientVersion(): string;
+    /**
+     * Get the user ID for service account authentication
+     */
+    protected getUserId(): string;
+}

package/dist/lib/BaseClient.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseClient = void 0;
+const constants_1 = require("../constants");
+/**
+ * Base client class that provides common functionality for all clients
+ */
+class BaseClient {
+    constructor(options) {
+        this.apiKey = options.apiKey || "";
+        this.baseURL = options.baseURL || constants_1.BASE_URL;
+        this.appName = options.appName || "unknown";
+        this.userId = options.userId || "";
+        // Check environment variable for HTTPS setting
+        const useHttps = process.env.MACROCOSMOS_USE_HTTPS !== "false";
+        // Use secure if explicitly set in options or if HTTPS is enabled via env var
+        this.secure = options.secure !== undefined ? options.secure : useHttps;
+        // Check if the API key is valid
+        if (!this.apiKey) {
+            throw new Error("API key is required");
+        }
+    }
+    /**
+     * Get the API key for authentication
+     */
+    getApiKey() {
+        return this.apiKey;
+    }
+    /**
+     * Get the base URL for the client
+     */
+    getBaseURL() {
+        return this.baseURL;
+    }
+    /**
+     * Get the app name for the client
+     */
+    getAppName() {
+        return this.appName;
+    }
+    /**
+     * Get whether the client is using secure connections
+     */
+    isSecure() {
+        return this.secure;
+    }
+    /**
+     * Get the client name
+     */
+    getClientName() {
+        return constants_1.CLIENT_NAME;
+    }
+    /**
+     * Get the client version
+     */
+    getClientVersion() {
+        return constants_1.VERSION;
+    }
+    /**
+     * Get the user ID for service account authentication
+     */
+    getUserId() {
+        return this.userId;
+    }
+}
+exports.BaseClient = BaseClient;

package/dist/lib/apex/Client.d.ts

@@ -1,12 +1,9 @@
 import * as grpc from "@grpc/grpc-js";
 import { IChatCompletionRequest, IChatMessage, ISamplingParameters, IChatCompletionResponse, IChatCompletionChunkResponse, IWebRetrievalRequest, IWebRetrievalResponse, IApexServiceClient } from "../../generated/apex/v1/apex";
+import { BaseClient, BaseClientOptions } from "../BaseClient";
 import { ApexStream } from "./Stream";
-interface ApexClientOptions {
-    apiKey?: string;
-    baseURL?: string;
-    appName?: string;
+interface ApexClientOptions extends BaseClientOptions {
     timeout?: number;
-    secure?: boolean;
 }
 export type ChatMessage = IChatMessage;
 export type SamplingParameters = ISamplingParameters;
@@ -26,16 +23,16 @@ export interface ApexProtoClient {
  * Client for interacting with the Apex API
  * Provides OpenAI-compatible interface over gRPC
  */
-export declare class ApexClient {
-    apiKey: string;
-    private baseURL;
-    private appName;
+export declare class ApexClient extends BaseClient {
     private protoClient;
     private defaultTimeout;
-    private secure;
     constructor(options: ApexClientOptions);
     private initializeGrpcClient;
     private createGrpcClient;
+    /**
+     * Get the default timeout for chat completions
+     */
+    private getDefaultTimeout;
     /**
      * OpenAI-compatible chat completions API
      */

package/dist/lib/apex/Client.js

@@ -37,14 +37,15 @@ exports.ApexClient = void 0;
 const grpc = __importStar(require("@grpc/grpc-js"));
 const protoLoader = __importStar(require("@grpc/proto-loader"));
 const path = __importStar(require("path"));
-const constants_1 = require("../../constants");
+const BaseClient_1 = require("../BaseClient");
 const Stream_1 = require("./Stream");
 /**
  * Client for interacting with the Apex API
  * Provides OpenAI-compatible interface over gRPC
  */
-class ApexClient {
+class ApexClient extends BaseClient_1.BaseClient {
     constructor(options) {
+        super(options);
         /**
          * OpenAI-compatible chat completions API
          */
@@ -55,7 +56,7 @@ class ApexClient {
                     // Apply default timeout if not specified in params
                     const requestParams = {
                         ...params,
-                        timeout: params.timeout || this.defaultTimeout,
+                        timeout: params.timeout || this.getDefaultTimeout(),
                     };
                     // Handle streaming vs non-streaming
                     if (requestParams.stream) {
@@ -96,20 +97,8 @@ class ApexClient {
                 });
             });
         };
-        this.apiKey = options.apiKey || constants_1.APEX_API_KEY || "";
-        this.baseURL = options.baseURL || constants_1.BASE_URL;
-        this.appName = options.appName || "unknown";
         this.defaultTimeout = options.timeout || 60;
-        // Check environment variable for HTTPS setting
-        const useHttps = process.env.MACROCOSMOS_USE_HTTPS !== "false";
-        // Use secure if explicitly set in options or if HTTPS is enabled via env var
-        this.secure = options.secure !== undefined ? options.secure : useHttps;
-        // Initialize gRPC client
         this.protoClient = this.initializeGrpcClient();
-        // Check if the API key is valid
-        if (!this.apiKey) {
-            throw new Error("API key is required");
-        }
     }
     initializeGrpcClient() {
         // Load proto file directly
@@ -130,15 +119,16 @@ class ApexClient {
         // Create gRPC credentials with API key
         const callCreds = grpc.credentials.createFromMetadataGenerator((_params, callback) => {
             const meta = new grpc.Metadata();
-            meta.add("authorization", `Bearer ${this.apiKey}`);
-            meta.add("x-source", this.appName);
-            meta.add("x-client-id", constants_1.CLIENT_NAME);
-            meta.add("x-client-version", constants_1.VERSION);
+            meta.add("authorization", `Bearer ${this.getApiKey()}`);
+            meta.add("x-source", this.getAppName());
+            meta.add("x-client-id", this.getClientName());
+            meta.add("x-client-version", this.getClientVersion());
+            meta.add("x-forwarded-user", this.getUserId());
             callback(null, meta);
         });
         // Create credentials based on secure option
         let credentials;
-        if (this.secure) {
+        if (this.isSecure()) {
             // Use secure credentials for production
             const channelCreds = grpc.credentials.createSsl();
             credentials = grpc.credentials.combineChannelCredentials(channelCreds, callCreds);
@@ -148,7 +138,13 @@ class ApexClient {
             credentials = grpc.credentials.createInsecure();
         }
         // Create gRPC client
-        return new this.protoClient.ApexService(this.baseURL, credentials);
+        return new this.protoClient.ApexService(this.getBaseURL(), credentials);
+    }
+    /**
+     * Get the default timeout for chat completions
+     */
+    getDefaultTimeout() {
+        return this.defaultTimeout;
     }
 }
 exports.ApexClient = ApexClient;

package/dist/lib/billing/Client.d.ts

@@ -1,11 +1,7 @@
 import * as grpc from "@grpc/grpc-js";
 import { IGetUsageRequest, IGetUsageResponse, IBillingServiceClient } from "../../generated/billing/v1/billing";
-interface BillingClientOptions {
-    apiKey?: string;
-    baseURL?: string;
-    appName?: string;
-    timeout?: number;
-    secure?: boolean;
+import { BaseClient, BaseClientOptions } from "../BaseClient";
+interface BillingClientOptions extends BaseClientOptions {
 }
 export type GetUsageRequest = IGetUsageRequest;
 export type GetUsageResponse = IGetUsageResponse;
@@ -20,13 +16,8 @@ export interface BillingProtoClient {
  * Client for interacting with the Billing API
  * Provides billing service interface over gRPC
  */
-export declare class BillingClient {
-    apiKey: string;
-    private baseURL;
-    private appName;
+export declare class BillingClient extends BaseClient {
     private protoClient;
-    private defaultTimeout;
-    private secure;
     constructor(options: BillingClientOptions);
     private initializeGrpcClient;
     private createGrpcClient;

package/dist/lib/billing/Client.js

@@ -37,13 +37,14 @@ exports.BillingClient = void 0;
 const grpc = __importStar(require("@grpc/grpc-js"));
 const protoLoader = __importStar(require("@grpc/proto-loader"));
 const path = __importStar(require("path"));
-const constants_1 = require("../../constants");
+const BaseClient_1 = require("../BaseClient");
 /**
  * Client for interacting with the Billing API
  * Provides billing service interface over gRPC
  */
-class BillingClient {
+class BillingClient extends BaseClient_1.BaseClient {
     constructor(options) {
+        super(options);
         /**
          * Get usage information for a product
          */
@@ -59,20 +60,7 @@ class BillingClient {
                 });
             });
         };
-        this.apiKey = options.apiKey || constants_1.APEX_API_KEY || "";
-        this.baseURL = options.baseURL || constants_1.BASE_URL;
-        this.appName = options.appName || "unknown";
-        this.defaultTimeout = options.timeout || 60;
-        // Check environment variable for HTTPS setting
-        const useHttps = process.env.MACROCOSMOS_USE_HTTPS !== "false";
-        // Use secure if explicitly set in options or if HTTPS is enabled via env var
-        this.secure = options.secure !== undefined ? options.secure : useHttps;
-        // Initialize gRPC client
         this.protoClient = this.initializeGrpcClient();
-        // Check if the API key is valid
-        if (!this.apiKey) {
-            throw new Error("API key is required");
-        }
     }
     initializeGrpcClient() {
         // Load proto file directly
@@ -93,15 +81,16 @@ class BillingClient {
         // Create gRPC credentials with API key
         const callCreds = grpc.credentials.createFromMetadataGenerator((_params, callback) => {
             const meta = new grpc.Metadata();
-            meta.add("authorization", `Bearer ${this.apiKey}`);
-            meta.add("x-source", this.appName);
-            meta.add("x-client-id", constants_1.CLIENT_NAME);
-            meta.add("x-client-version", constants_1.VERSION);
+            meta.add("authorization", `Bearer ${this.getApiKey()}`);
+            meta.add("x-source", this.getAppName());
+            meta.add("x-client-id", this.getClientName());
+            meta.add("x-client-version", this.getClientVersion());
+            meta.add("x-forwarded-user", this.getUserId());
             callback(null, meta);
         });
         // Create credentials based on secure option
         let credentials;
-        if (this.secure) {
+        if (this.isSecure()) {
             // Use secure credentials for production
             const channelCreds = grpc.credentials.createSsl();
             credentials = grpc.credentials.combineChannelCredentials(channelCreds, callCreds);
@@ -111,7 +100,7 @@ class BillingClient {
             credentials = grpc.credentials.createInsecure();
         }
         // Create gRPC client
-        return new this.protoClient.BillingService(this.baseURL, credentials);
+        return new this.protoClient.BillingService(this.getBaseURL(), credentials);
     }
 }
 exports.BillingClient = BillingClient;

package/dist/lib/gravity/Client.d.ts

@@ -1,23 +1,21 @@
-import { IGetGravityTasksRequest, IGetGravityTasksResponse, IGetCrawlerRequest, IGetCrawlerResponse, ICreateGravityTaskRequest, ICreateGravityTaskResponse, IBuildDatasetRequest, IBuildDatasetResponse, IGetDatasetRequest, IGetDatasetResponse, ICancelGravityTaskRequest, ICancelGravityTaskResponse, ICancelDatasetRequest, ICancelDatasetResponse, IGravityTask, ICrawler, IDataset } from "../../generated/gravity/v1/gravity";
-interface GravityClientOptions {
-    apiKey?: string;
-    baseURL?: string;
-    appName?: string;
-    secure?: boolean;
+import * as grpc from "@grpc/grpc-js";
+import { IGetGravityTasksRequest, IGetGravityTasksResponse, IGetCrawlerRequest, IGetCrawlerResponse, ICreateGravityTaskRequest, ICreateGravityTaskResponse, IBuildDatasetRequest, IBuildDatasetResponse, IGetDatasetRequest, IGetDatasetResponse, ICancelGravityTaskRequest, ICancelGravityTaskResponse, ICancelDatasetRequest, ICancelDatasetResponse, IGravityServiceClient } from "../../generated/gravity/v1/gravity";
+import { BaseClient, BaseClientOptions } from "../BaseClient";
+interface GravityClientOptions extends BaseClientOptions {
+}
+interface GravityService extends grpc.ServiceClientConstructor, IGravityServiceClient {
+}
+export interface GravityProtoClient {
+    GravityService: {
+        new (address: string, credentials: grpc.ChannelCredentials): GravityService;
+    };
 }
-export type GravityTask = IGravityTask;
-export type Crawler = ICrawler;
-export type Dataset = IDataset;
 /**
  * Client for interacting with the Gravity API
  * Provides gRPC interface for data collection and dataset management
  */
-export declare class GravityClient {
-    apiKey: string;
-    private baseURL;
-    private appName;
+export declare class GravityClient extends BaseClient {
     private protoClient;
-    private secure;
     constructor(options: GravityClientOptions);
     private initializeGrpcClient;
     private createGrpcClient;

package/dist/lib/gravity/Client.js

@@ -37,13 +37,14 @@ exports.GravityClient = void 0;
 const grpc = __importStar(require("@grpc/grpc-js"));
 const protoLoader = __importStar(require("@grpc/proto-loader"));
 const path = __importStar(require("path"));
-const constants_1 = require("../../constants");
+const BaseClient_1 = require("../BaseClient");
 /**
  * Client for interacting with the Gravity API
  * Provides gRPC interface for data collection and dataset management
  */
-class GravityClient {
+class GravityClient extends BaseClient_1.BaseClient {
     constructor(options) {
+        super(options);
         /**
          * Lists all data collection tasks for a user
          */
@@ -149,19 +150,7 @@ class GravityClient {
                 });
             });
         };
-        this.apiKey = options.apiKey || constants_1.GRAVITY_API_KEY || "";
-        this.baseURL = options.baseURL || constants_1.BASE_URL;
-        this.appName = options.appName || "unknown";
-        // Check environment variable for HTTPS setting
-        const useHttps = process.env.MACROCOSMOS_USE_HTTPS !== "false";
-        // Use secure if explicitly set in options or if HTTPS is enabled via env var
-        this.secure = options.secure !== undefined ? options.secure : useHttps;
-        // Initialize gRPC client
         this.protoClient = this.initializeGrpcClient();
-        // Check if the API key is valid
-        if (!this.apiKey) {
-            throw new Error("API key is required");
-        }
     }
     initializeGrpcClient() {
         // Load proto file directly
@@ -182,15 +171,16 @@ class GravityClient {
         // Create gRPC credentials with API key
         const callCreds = grpc.credentials.createFromMetadataGenerator((_params, callback) => {
             const meta = new grpc.Metadata();
-            meta.add("authorization", `Bearer ${this.apiKey}`);
-            meta.add("x-source", this.appName);
-            meta.add("x-client-id", constants_1.CLIENT_NAME);
-            meta.add("x-client-version", constants_1.VERSION);
+            meta.add("authorization", `Bearer ${this.getApiKey()}`);
+            meta.add("x-source", this.getAppName());
+            meta.add("x-client-id", this.getClientName());
+            meta.add("x-client-version", this.getClientVersion());
+            meta.add("x-forwarded-user", this.getUserId());
             callback(null, meta);
         });
         // Create credentials based on secure option
         let credentials;
-        if (this.secure) {
+        if (this.isSecure()) {
             // Use secure credentials for production
             const channelCreds = grpc.credentials.createSsl();
             credentials = grpc.credentials.combineChannelCredentials(channelCreds, callCreds);
@@ -200,7 +190,7 @@ class GravityClient {
             credentials = grpc.credentials.createInsecure();
         }
         // Create gRPC client
-        return new this.protoClient.GravityService(this.baseURL, credentials);
+        return new this.protoClient.GravityService(this.getBaseURL(), credentials);
     }
 }
 exports.GravityClient = GravityClient;

package/dist/lib/sn13/Client.d.ts

@@ -1,11 +1,7 @@
 import * as grpc from "@grpc/grpc-js";
 import { IListTopicsRequest, IListTopicsResponse, IListTopicsResponseDetail, IValidateRedditTopicRequest, IValidateRedditTopicResponse, ISn13ServiceClient } from "../../generated/sn13/v1/sn13_validator";
-interface Sn13ClientOptions {
-    apiKey?: string;
-    baseURL?: string;
-    appName?: string;
-    timeout?: number;
-    secure?: boolean;
+import { BaseClient, BaseClientOptions } from "../BaseClient";
+interface Sn13ClientOptions extends BaseClientOptions {
 }
 export type ListTopicsRequest = IListTopicsRequest;
 export type ListTopicsResponse = IListTopicsResponse;
@@ -23,13 +19,8 @@ export interface Sn13ProtoClient {
  * Client for interacting with the SN13 API
  * Provides SN13 service interface over gRPC
  */
-export declare class Sn13Client {
-    apiKey: string;
-    private baseURL;
-    private appName;
+export declare class Sn13Client extends BaseClient {
     private protoClient;
-    private defaultTimeout;
-    private secure;
     constructor(options: Sn13ClientOptions);
     private initializeGrpcClient;
     private createGrpcClient;

package/dist/lib/sn13/Client.js

@@ -37,13 +37,14 @@ exports.Sn13Client = void 0;
 const grpc = __importStar(require("@grpc/grpc-js"));
 const protoLoader = __importStar(require("@grpc/proto-loader"));
 const path = __importStar(require("path"));
-const constants_1 = require("../../constants");
+const BaseClient_1 = require("../BaseClient");
 /**
  * Client for interacting with the SN13 API
  * Provides SN13 service interface over gRPC
  */
-class Sn13Client {
+class Sn13Client extends BaseClient_1.BaseClient {
     constructor(options) {
+        super(options);
         /**
          * List topics from a source
          */
@@ -74,20 +75,7 @@ class Sn13Client {
                 });
             });
         };
-        this.apiKey = options.apiKey || constants_1.APEX_API_KEY || "";
-        this.baseURL = options.baseURL || constants_1.BASE_URL;
-        this.appName = options.appName || "unknown";
-        this.defaultTimeout = options.timeout || 60;
-        // Check environment variable for HTTPS setting
-        const useHttps = process.env.MACROCOSMOS_USE_HTTPS !== "false";
-        // Use secure if explicitly set in options or if HTTPS is enabled via env var
-        this.secure = options.secure !== undefined ? options.secure : useHttps;
-        // Initialize gRPC client
         this.protoClient = this.initializeGrpcClient();
-        // Check if the API key is valid
-        if (!this.apiKey) {
-            throw new Error("API key is required");
-        }
     }
     initializeGrpcClient() {
         // Load proto file directly
@@ -108,15 +96,16 @@ class Sn13Client {
         // Create gRPC credentials with API key
         const callCreds = grpc.credentials.createFromMetadataGenerator((_params, callback) => {
             const meta = new grpc.Metadata();
-            meta.add("authorization", `Bearer ${this.apiKey}`);
-            meta.add("x-source", this.appName);
-            meta.add("x-client-id", constants_1.CLIENT_NAME);
-            meta.add("x-client-version", constants_1.VERSION);
+            meta.add("authorization", `Bearer ${this.getApiKey()}`);
+            meta.add("x-source", this.getAppName());
+            meta.add("x-client-id", this.getClientName());
+            meta.add("x-client-version", this.getClientVersion());
+            meta.add("x-forwarded-user", this.getUserId());
             callback(null, meta);
         });
         // Create credentials based on secure option
         let credentials;
-        if (this.secure) {
+        if (this.isSecure()) {
             // Use secure credentials for production
             const channelCreds = grpc.credentials.createSsl();
             credentials = grpc.credentials.combineChannelCredentials(channelCreds, callCreds);
@@ -126,7 +115,7 @@ class Sn13Client {
             credentials = grpc.credentials.createInsecure();
         }
         // Create gRPC client
-        return new this.protoClient.Sn13Service(this.baseURL, credentials);
+        return new this.protoClient.Sn13Service(this.getBaseURL(), credentials);
     }
 }
 exports.Sn13Client = Sn13Client;

package/new_version.txt

@@ -0,0 +1 @@
+1.2.2

package/old_version.txt

@@ -0,0 +1 @@
+1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "macrocosmos",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "TypeScript SDK package for Macrocosmos",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",