macrocosmos 1.2.2 → 1.2.4

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

@@ -1,29 +1,16 @@
-import * as grpc from "@grpc/grpc-js";
-import { IGetUsageRequest, IGetUsageResponse, IBillingServiceClient } from "../../generated/billing/v1/billing";
+import { BillingServiceClient, GetUsageRequest, GetUsageResponse } from "../../generated/billing/v1/billing";
 import { BaseClient, BaseClientOptions } from "../BaseClient";
-interface BillingClientOptions extends BaseClientOptions {
-}
-export type GetUsageRequest = IGetUsageRequest;
-export type GetUsageResponse = IGetUsageResponse;
-interface BillingService extends grpc.ServiceClientConstructor, IBillingServiceClient {
-}
-export interface BillingProtoClient {
-    BillingService: {
-        new (address: string, credentials: grpc.ChannelCredentials): BillingService;
-    };
-}
+export type { GetUsageResponse, GetUsageRequest };
 /**
  * Client for interacting with the Billing API
  * Provides billing service interface over gRPC
  */
 export declare class BillingClient extends BaseClient {
-    private protoClient;
-    constructor(options: BillingClientOptions);
-    private initializeGrpcClient;
+    private _grpcClient?;
+    constructor(options: BaseClientOptions, grpcClient?: BillingServiceClient);
     private createGrpcClient;
     /**
      * Get usage information for a product
      */
     getUsage: (params: GetUsageRequest) => Promise<GetUsageResponse>;
 }
-export {};

package/dist/lib/billing/Client.js

@@ -34,16 +34,15 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BillingClient = void 0;
+const billing_1 = require("../../generated/billing/v1/billing");
 const grpc = __importStar(require("@grpc/grpc-js"));
-const protoLoader = __importStar(require("@grpc/proto-loader"));
-const path = __importStar(require("path"));
 const BaseClient_1 = require("../BaseClient");
 /**
  * Client for interacting with the Billing API
  * Provides billing service interface over gRPC
  */
 class BillingClient extends BaseClient_1.BaseClient {
-    constructor(options) {
+    constructor(options, grpcClient) {
         super(options);
         /**
          * Get usage information for a product
@@ -51,7 +50,7 @@ class BillingClient extends BaseClient_1.BaseClient {
         this.getUsage = async (params) => {
             const client = this.createGrpcClient();
             return new Promise((resolve, reject) => {
-                void client.GetUsage(params, (error, response) => {
+                client.getUsage(params, (error, response) => {
                     if (error) {
                         reject(error);
                         return;
@@ -60,24 +59,11 @@ class BillingClient extends BaseClient_1.BaseClient {
                 });
             });
         };
-        this.protoClient = this.initializeGrpcClient();
-    }
-    initializeGrpcClient() {
-        // Load proto file directly
-        const PROTO_PATH = path.resolve(__dirname, "../../../protos/billing/v1/billing.proto");
-        // Load protos using standard protobuf loader
-        const packageDefinition = protoLoader.loadSync(PROTO_PATH, {
-            keepCase: false,
-            longs: String,
-            enums: String,
-            defaults: true,
-            oneofs: true,
-        });
-        // Get the BillingService definition
-        const protoDescriptor = grpc.loadPackageDefinition(packageDefinition);
-        return protoDescriptor.billing.v1;
+        this._grpcClient = grpcClient;
     }
     createGrpcClient() {
+        if (this._grpcClient)
+            return this._grpcClient;
         // Create gRPC credentials with API key
         const callCreds = grpc.credentials.createFromMetadataGenerator((_params, callback) => {
             const meta = new grpc.Metadata();
@@ -100,7 +86,7 @@ class BillingClient extends BaseClient_1.BaseClient {
             credentials = grpc.credentials.createInsecure();
         }
         // Create gRPC client
-        return new this.protoClient.BillingService(this.getBaseURL(), credentials);
+        return new billing_1.BillingServiceClient(this.getBaseURL(), credentials);
     }
 }
 exports.BillingClient = BillingClient;

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

@@ -1,51 +1,43 @@
-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 { GravityServiceClient, GetGravityTasksRequest, GetGravityTasksResponse, GetCrawlerRequest, GetCrawlerResponse, CreateGravityTaskRequest as GeneratedCreateGravityTaskRequest, CreateGravityTaskResponse, BuildDatasetRequest as GeneratedBuildDatasetRequest, BuildDatasetResponse, GetDatasetRequest, GetDatasetResponse, CancelGravityTaskRequest, CancelGravityTaskResponse, CancelDatasetRequest, CancelDatasetResponse, Crawler, CrawlerCriteria, CrawlerNotification, HfRepo, CrawlerState, GravityTaskState, NotificationRequest, Dataset, DatasetFile, DatasetStep } 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;
-    };
-}
+import { MarkFieldsOptional } from "../util.types";
+type CreateGravityTaskRequest = MarkFieldsOptional<GeneratedCreateGravityTaskRequest, "notificationRequests">;
+type BuildDatasetRequest = MarkFieldsOptional<GeneratedBuildDatasetRequest, "notificationRequests">;
+export type { GetGravityTasksRequest, GetGravityTasksResponse, GetCrawlerRequest, GetCrawlerResponse, CreateGravityTaskRequest, CreateGravityTaskResponse, BuildDatasetRequest, BuildDatasetResponse, GetDatasetRequest, GetDatasetResponse, CancelGravityTaskRequest, CancelGravityTaskResponse, CancelDatasetRequest, CancelDatasetResponse, Crawler, CrawlerCriteria, CrawlerNotification, HfRepo, CrawlerState, GravityTaskState, NotificationRequest, Dataset, DatasetFile, DatasetStep, };
 /**
  * Client for interacting with the Gravity API
  * Provides gRPC interface for data collection and dataset management
  */
 export declare class GravityClient extends BaseClient {
-    private protoClient;
-    constructor(options: GravityClientOptions);
-    private initializeGrpcClient;
+    private _grpcClient?;
+    constructor(options: BaseClientOptions, grpcClient?: GravityServiceClient);
     private createGrpcClient;
     /**
      * Lists all data collection tasks for a user
      */
-    getGravityTasks: (params: IGetGravityTasksRequest) => Promise<IGetGravityTasksResponse>;
+    getGravityTasks: (params: GetGravityTasksRequest) => Promise<GetGravityTasksResponse>;
     /**
      * Get a single crawler by its ID
      */
-    getCrawler: (params: IGetCrawlerRequest) => Promise<IGetCrawlerResponse>;
+    getCrawler: (params: GetCrawlerRequest) => Promise<GetCrawlerResponse>;
     /**
      * Create a new gravity task
      */
-    createGravityTask: (params: ICreateGravityTaskRequest) => Promise<ICreateGravityTaskResponse>;
+    createGravityTask: (params: CreateGravityTaskRequest) => Promise<CreateGravityTaskResponse>;
     /**
      * Build a dataset for a single crawler
      */
-    buildDataset: (params: IBuildDatasetRequest) => Promise<IBuildDatasetResponse>;
+    buildDataset: (params: BuildDatasetRequest) => Promise<BuildDatasetResponse>;
     /**
      * Get the dataset build status and results
      */
-    getDataset: (params: IGetDatasetRequest) => Promise<IGetDatasetResponse>;
+    getDataset: (params: GetDatasetRequest) => Promise<GetDatasetResponse>;
     /**
      * Cancel a gravity task and any crawlers associated with it
      */
-    cancelGravityTask: (params: ICancelGravityTaskRequest) => Promise<ICancelGravityTaskResponse>;
+    cancelGravityTask: (params: CancelGravityTaskRequest) => Promise<CancelGravityTaskResponse>;
     /**
      * Cancel dataset build if it is in progress and purges the dataset
      */
-    cancelDataset: (params: ICancelDatasetRequest) => Promise<ICancelDatasetResponse>;
+    cancelDataset: (params: CancelDatasetRequest) => Promise<CancelDatasetResponse>;
 }
-export {};

package/dist/lib/gravity/Client.js

@@ -35,15 +35,14 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GravityClient = void 0;
 const grpc = __importStar(require("@grpc/grpc-js"));
-const protoLoader = __importStar(require("@grpc/proto-loader"));
-const path = __importStar(require("path"));
+const gravity_1 = require("../../generated/gravity/v1/gravity");
 const BaseClient_1 = require("../BaseClient");
 /**
  * Client for interacting with the Gravity API
  * Provides gRPC interface for data collection and dataset management
  */
 class GravityClient extends BaseClient_1.BaseClient {
-    constructor(options) {
+    constructor(options, grpcClient) {
         super(options);
         /**
          * Lists all data collection tasks for a user
@@ -51,7 +50,7 @@ class GravityClient extends BaseClient_1.BaseClient {
         this.getGravityTasks = async (params) => {
             const client = this.createGrpcClient();
             return new Promise((resolve, reject) => {
-                void client.GetGravityTasks(params, (error, response) => {
+                client.getGravityTasks(params, (error, response) => {
                     if (error) {
                         reject(error);
                         return;
@@ -66,7 +65,7 @@ class GravityClient extends BaseClient_1.BaseClient {
         this.getCrawler = async (params) => {
             const client = this.createGrpcClient();
             return new Promise((resolve, reject) => {
-                void client.GetCrawler(params, (error, response) => {
+                client.getCrawler(params, (error, response) => {
                     if (error) {
                         reject(error);
                         return;
@@ -81,7 +80,7 @@ class GravityClient extends BaseClient_1.BaseClient {
         this.createGravityTask = async (params) => {
             const client = this.createGrpcClient();
             return new Promise((resolve, reject) => {
-                void client.CreateGravityTask(params, (error, response) => {
+                client.createGravityTask(params, (error, response) => {
                     if (error) {
                         reject(error);
                         return;
@@ -96,7 +95,7 @@ class GravityClient extends BaseClient_1.BaseClient {
         this.buildDataset = async (params) => {
             const client = this.createGrpcClient();
             return new Promise((resolve, reject) => {
-                void client.BuildDataset(params, (error, response) => {
+                client.buildDataset(params, (error, response) => {
                     if (error) {
                         reject(error);
                         return;
@@ -111,7 +110,7 @@ class GravityClient extends BaseClient_1.BaseClient {
         this.getDataset = async (params) => {
             const client = this.createGrpcClient();
             return new Promise((resolve, reject) => {
-                void client.GetDataset(params, (error, response) => {
+                client.getDataset(params, (error, response) => {
                     if (error) {
                         reject(error);
                         return;
@@ -126,7 +125,7 @@ class GravityClient extends BaseClient_1.BaseClient {
         this.cancelGravityTask = async (params) => {
             const client = this.createGrpcClient();
             return new Promise((resolve, reject) => {
-                void client.CancelGravityTask(params, (error, response) => {
+                client.cancelGravityTask(params, (error, response) => {
                     if (error) {
                         reject(error);
                         return;
@@ -141,7 +140,7 @@ class GravityClient extends BaseClient_1.BaseClient {
         this.cancelDataset = async (params) => {
             const client = this.createGrpcClient();
             return new Promise((resolve, reject) => {
-                void client.CancelDataset(params, (error, response) => {
+                client.cancelDataset(params, (error, response) => {
                     if (error) {
                         reject(error);
                         return;
@@ -150,24 +149,11 @@ class GravityClient extends BaseClient_1.BaseClient {
                 });
             });
         };
-        this.protoClient = this.initializeGrpcClient();
-    }
-    initializeGrpcClient() {
-        // Load proto file directly
-        const PROTO_PATH = path.resolve(__dirname, "../../../protos/gravity/v1/gravity.proto");
-        // Load protos using standard protobuf loader
-        const packageDefinition = protoLoader.loadSync(PROTO_PATH, {
-            keepCase: false,
-            longs: String,
-            enums: String,
-            defaults: true,
-            oneofs: true,
-        });
-        // Get the GravityService definition
-        const protoDescriptor = grpc.loadPackageDefinition(packageDefinition);
-        return protoDescriptor.gravity.v1;
+        this._grpcClient = grpcClient;
     }
     createGrpcClient() {
+        if (this._grpcClient)
+            return this._grpcClient;
         // Create gRPC credentials with API key
         const callCreds = grpc.credentials.createFromMetadataGenerator((_params, callback) => {
             const meta = new grpc.Metadata();
@@ -190,7 +176,7 @@ class GravityClient extends BaseClient_1.BaseClient {
             credentials = grpc.credentials.createInsecure();
         }
         // Create gRPC client
-        return new this.protoClient.GravityService(this.getBaseURL(), credentials);
+        return new gravity_1.GravityServiceClient(this.getBaseURL(), credentials);
     }
 }
 exports.GravityClient = GravityClient;

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

@@ -1,28 +1,13 @@
-import * as grpc from "@grpc/grpc-js";
-import { IListTopicsRequest, IListTopicsResponse, IListTopicsResponseDetail, IValidateRedditTopicRequest, IValidateRedditTopicResponse, ISn13ServiceClient } from "../../generated/sn13/v1/sn13_validator";
+import { Sn13ServiceClient, ListTopicsRequest, ListTopicsResponse, ListTopicsResponseDetail, ValidateRedditTopicRequest, ValidateRedditTopicResponse } from "../../generated/sn13/v1/sn13_validator";
 import { BaseClient, BaseClientOptions } from "../BaseClient";
-interface Sn13ClientOptions extends BaseClientOptions {
-}
-export type ListTopicsRequest = IListTopicsRequest;
-export type ListTopicsResponse = IListTopicsResponse;
-export type ListTopicsResponseDetail = IListTopicsResponseDetail;
-export type ValidateRedditTopicRequest = IValidateRedditTopicRequest;
-export type ValidateRedditTopicResponse = IValidateRedditTopicResponse;
-interface Sn13Service extends grpc.ServiceClientConstructor, ISn13ServiceClient {
-}
-export interface Sn13ProtoClient {
-    Sn13Service: {
-        new (address: string, credentials: grpc.ChannelCredentials): Sn13Service;
-    };
-}
+export type { ListTopicsRequest, ListTopicsResponse, ListTopicsResponseDetail, ValidateRedditTopicRequest, ValidateRedditTopicResponse, };
 /**
  * Client for interacting with the SN13 API
  * Provides SN13 service interface over gRPC
  */
 export declare class Sn13Client extends BaseClient {
-    private protoClient;
-    constructor(options: Sn13ClientOptions);
-    private initializeGrpcClient;
+    private _grpcClient?;
+    constructor(options: BaseClientOptions, grpcClient?: Sn13ServiceClient);
     private createGrpcClient;
     /**
      * List topics from a source
@@ -33,4 +18,3 @@ export declare class Sn13Client extends BaseClient {
      */
     validateRedditTopic: (params: ValidateRedditTopicRequest) => Promise<ValidateRedditTopicResponse>;
 }
-export {};

package/dist/lib/sn13/Client.js

@@ -34,16 +34,15 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Sn13Client = void 0;
+const sn13_validator_1 = require("../../generated/sn13/v1/sn13_validator");
 const grpc = __importStar(require("@grpc/grpc-js"));
-const protoLoader = __importStar(require("@grpc/proto-loader"));
-const path = __importStar(require("path"));
 const BaseClient_1 = require("../BaseClient");
 /**
  * Client for interacting with the SN13 API
  * Provides SN13 service interface over gRPC
  */
 class Sn13Client extends BaseClient_1.BaseClient {
-    constructor(options) {
+    constructor(options, grpcClient) {
         super(options);
         /**
          * List topics from a source
@@ -51,7 +50,7 @@ class Sn13Client extends BaseClient_1.BaseClient {
         this.listTopics = async (params) => {
             const client = this.createGrpcClient();
             return new Promise((resolve, reject) => {
-                void client.ListTopics(params, (error, response) => {
+                client.listTopics(params, (error, response) => {
                     if (error) {
                         reject(error);
                         return;
@@ -66,7 +65,7 @@ class Sn13Client extends BaseClient_1.BaseClient {
         this.validateRedditTopic = async (params) => {
             const client = this.createGrpcClient();
             return new Promise((resolve, reject) => {
-                void client.ValidateRedditTopic(params, (error, response) => {
+                client.validateRedditTopic(params, (error, response) => {
                     if (error) {
                         reject(error);
                         return;
@@ -75,24 +74,11 @@ class Sn13Client extends BaseClient_1.BaseClient {
                 });
             });
         };
-        this.protoClient = this.initializeGrpcClient();
-    }
-    initializeGrpcClient() {
-        // Load proto file directly
-        const PROTO_PATH = path.resolve(__dirname, "../../../protos/sn13/v1/sn13_validator.proto");
-        // Load protos using standard protobuf loader
-        const packageDefinition = protoLoader.loadSync(PROTO_PATH, {
-            keepCase: false,
-            longs: String,
-            enums: String,
-            defaults: true,
-            oneofs: true,
-        });
-        // Get the Sn13Service definition
-        const protoDescriptor = grpc.loadPackageDefinition(packageDefinition);
-        return protoDescriptor.sn13.v1;
+        this._grpcClient = grpcClient;
     }
     createGrpcClient() {
+        if (this._grpcClient)
+            return this._grpcClient;
         // Create gRPC credentials with API key
         const callCreds = grpc.credentials.createFromMetadataGenerator((_params, callback) => {
             const meta = new grpc.Metadata();
@@ -115,7 +101,7 @@ class Sn13Client extends BaseClient_1.BaseClient {
             credentials = grpc.credentials.createInsecure();
         }
         // Create gRPC client
-        return new this.protoClient.Sn13Service(this.getBaseURL(), credentials);
+        return new sn13_validator_1.Sn13ServiceClient(this.getBaseURL(), credentials);
     }
 }
 exports.Sn13Client = Sn13Client;

package/dist/lib/util.types.d.ts

@@ -0,0 +1 @@
+export type MarkFieldsOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;

package/dist/lib/util.types.js

@@ -0,0 +1,3 @@
+"use strict";
+// Utility types for the package
+Object.defineProperty(exports, "__esModule", { value: true });

package/new_version.txt

@@ -1 +1 @@
-1.2.2
+1.2.4

package/old_version.txt

@@ -1 +1 @@
-1.2.1
+1.2.3

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "macrocosmos",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "TypeScript SDK package for Macrocosmos",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "clean": "rimraf dist",
-    "build": "npm run clean && npm run generate && tsc",
+    "build": "npm run clean && npm run gen:proto && tsc",
+    "pack": "npm pack && tar -tf macrocosmos-$(node -p \"require('./package.json').version\").tgz && open macrocosmos-$(node -p \"require('./package.json').version\").tgz",
+    "pack:rm": "rm macrocosmos-$(node -p \"require('./package.json').version\").tgz && rm -rf package",
     "ts-check": "tsc --noEmit",
     "test": "jest",
     "test:watch": "jest --watch",
@@ -14,7 +16,7 @@
     "lint:fix": "eslint . --ext .ts --fix",
     "format:check": "prettier --check \"src/**/*.{ts,js,json,md}\"",
     "format:write": "prettier --write \"src/**/*.{ts,js,json,md}\"",
-    "generate": "ts-node scripts/generate-protos.ts && npm run format:write",
+    "gen:proto": "npx protoc --plugin=protoc-gen-ts_proto=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=./src/generated --ts_proto_opt=outputServices=grpc-js,useOptionals=messages,useExactTypes=false,esModuleInterop=true,forceLong=number -I ./protos $(find ./protos -name \"*.proto\") && prettier --write \"src/generated/**/*.{ts,js,json,md}\" ",
     "example:sn13:list-topics": "ts-node src/__examples__/sn13/list-topics.ts"
   },
   "keywords": [],
@@ -24,6 +26,7 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.10.1",
     "@grpc/proto-loader": "^0.7.10",
+    "dotenv": "^16.5.0",
     "protobufjs": "^7.2.6"
   },
   "prettier": {
@@ -49,6 +52,7 @@
     "rimraf": "^5.0.5",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
+    "ts-proto": "^2.7.0",
     "typescript": "^5.3.3"
   }
 }

package/tsconfig.eslint.json

@@ -1,5 +1,5 @@
 {
   "extends": "./tsconfig.json",
-  "include": ["src/**/*", "scripts/**/*"],
+  "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
 } 

package/eslint.config.cjs

@@ -1,33 +0,0 @@
-const tsPlugin = require("@typescript-eslint/eslint-plugin");
-const tsParser = require("@typescript-eslint/parser");
-const prettierPlugin = require("eslint-plugin-prettier");
-
-module.exports = [
-  {
-    ignores: ["node_modules", "dist", "build"],
-  },
-  {
-    files: ["**/*.{ts,tsx}"],
-    languageOptions: {
-      parser: tsParser,
-      parserOptions: {
-        project: "./tsconfig.eslint.json",
-        tsconfigRootDir: __dirname,
-        sourceType: "module",
-      },
-    },
-    plugins: {
-      "@typescript-eslint": tsPlugin,
-      prettier: prettierPlugin,
-    },
-    rules: {
-      ...tsPlugin.configs.recommended.rules,
-      ...tsPlugin.configs["recommended-type-checked"].rules,
-      "prettier/prettier": "warn",
-      "@typescript-eslint/no-unused-vars": [
-        "warn",
-        { argsIgnorePattern: "^_", varsIgnorePattern: "^_" },
-      ],
-    },
-  },
-];