@chirpier/chirpier-js 0.1.2 → 0.1.3

package/README.md

@@ -13,7 +13,7 @@ The Chirpier SDK is a lightweight, versatile library for monitoring and tracking
 
 You can install the Chirpier SDK via npm:
 ```
-npm install @chirpier/sdk
+npm install @chirpier/chirpier-js
 ```
 
 ## Getting Started
@@ -24,7 +24,7 @@ To start using the SDK, you need to initialize it with your API key. The SDK wor
 
 #### In a Browser
 ```
-import { initialize, monitor } from '@chirpier/sdk-js';
+import { initialize, monitor } from '@chirpier/chirpier-js';
 
 // Initialize the SDK with your API key
 initialize({ key: 'your-api-key' });
@@ -32,7 +32,7 @@ initialize({ key: 'your-api-key' });
 // Send a data stream tied to a group of streams
 monitor({
   group_id: '02e4f4d8-415e-4fc1-b01a-677ac5bc9207',
-  stream: 'Sales',
+  stream_name: 'Sales',
   value: 15.30,
 });
 ```
@@ -40,7 +40,7 @@ monitor({
 #### In a Server (e.g., Express.js)
 ```
 const express = require('express');
-const { initialize, monitor } = require('@chirpier/sdk-js');
+const { initialize, monitor } = require('@chirpier/chirpier-js');
 
 const app = express();
 const port = 3000;
@@ -76,7 +76,7 @@ initialize({ key: 'your-api-key' });
 // Monitor an event
 monitor({
   group_id: 'group UUID',
-  stream: 'Sales',
+  stream_name: 'Sales',
   value: 15.3,
 });
 ```
@@ -85,7 +85,3 @@ monitor({
 Handling Offline Scenarios
 
 The SDK automatically queues events when the network is unavailable and sends them when the connection is restored.
-
-## Custom Storage Mechanisms
-
-The SDK uses localStorage for browser environments and in memory storage for Node.js. If you need a custom storage mechanism, you can extend the SDK by implementing the Storage interface.

package/dist/__tests__/sdk.test.js

@@ -43,216 +43,153 @@ var index_1 = require("../index");
 var constants_1 = require("../constants");
 var axios_mock_adapter_1 = __importDefault(require("axios-mock-adapter"));
 var axios_1 = __importDefault(require("axios"));
-var server_1 = require("./mocks/server");
-var uuid_1 = require("@lukeed/uuid");
-jest.mock("@lukeed/uuid");
 describe("Chirpier SDK", function () {
-    var chirpier;
-    afterEach(function () {
-        // Clean up mock server
-        (0, server_1.cleanupMockServer)();
-    });
     describe("Initialization", function () {
-        test("should initialize with default values", function () {
-            chirpier = new index_1.Chirpier({
-                key: "api_key",
-            });
-            // Setup mock server
-            var mock = new axios_mock_adapter_1.default(axios_1.default);
-            mock.onPost(constants_1.DEFAULT_API_ENDPOINT).reply(200, { success: true });
-            expect(chirpier["apiEndpoint"]).toBe(constants_1.DEFAULT_API_ENDPOINT);
-            expect(chirpier["retries"]).toBe(constants_1.DEFAULT_RETRIES);
+        test("should throw error if monitor is called before initialize", function () {
+            var event = {
+                group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
+                stream_name: "test-stream",
+                value: 1,
+            };
+            expect(function () { return (0, index_1.monitor)(event); }).toThrow(index_1.ChirpierError);
+            expect(function () { return (0, index_1.monitor)(event); }).toThrow("Chirpier SDK is not initialized. Please call initialize() first.");
         });
-        test("should initialize with custom values using mock server", function () {
-            chirpier = new index_1.Chirpier({
-                key: "api_key",
+        test("should initialize with default values", function () {
+            (0, index_1.initialize)({
+                key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
             });
+            var chirpier = index_1.Chirpier.getInstance({});
             // Setup mock server
             var mock = new axios_mock_adapter_1.default(axios_1.default);
             mock.onPost(constants_1.DEFAULT_API_ENDPOINT).reply(200, { success: true });
-            var customChirpier = new index_1.Chirpier({
-                key: "api_key",
-                apiEndpoint: constants_1.DEFAULT_API_ENDPOINT,
-                retries: 5,
-            });
-            expect(customChirpier["apiEndpoint"]).toBe(constants_1.DEFAULT_API_ENDPOINT);
-            expect(customChirpier["retries"]).toBe(5);
+            expect(chirpier === null || chirpier === void 0 ? void 0 : chirpier["apiEndpoint"]).toBe(constants_1.DEFAULT_API_ENDPOINT);
+            expect(chirpier === null || chirpier === void 0 ? void 0 : chirpier["retries"]).toBe(constants_1.DEFAULT_RETRIES);
+            expect(chirpier === null || chirpier === void 0 ? void 0 : chirpier["timeout"]).toBe(constants_1.DEFAULT_TIMEOUT);
+            expect(chirpier === null || chirpier === void 0 ? void 0 : chirpier["batchSize"]).toBe(constants_1.DEFAULT_BATCH_SIZE);
+            expect(chirpier === null || chirpier === void 0 ? void 0 : chirpier["flushTimeout"]).toBe(constants_1.DEFAULT_FLUSH_DELAY);
+            index_1.Chirpier.stop();
         });
         test("should throw error if key is not provided", function () {
-            chirpier = new index_1.Chirpier({
-                key: "api_key",
-            });
-            // Setup mock server
-            var mock = new axios_mock_adapter_1.default(axios_1.default);
-            mock.onPost(constants_1.DEFAULT_API_ENDPOINT).reply(200, { success: true });
-            expect(function () { return new index_1.Chirpier({}); }).toThrow(index_1.ChirpierError);
-        });
-        test("should throw error if key is not a valid JWT", function () {
-            expect(function () { return (0, index_1.initialize)({ key: "invalid_key" }); }).toThrow(index_1.ChirpierError);
-        });
-        test("should initialize successfully with a valid JWT", function () {
-            var validJWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
-            expect(function () { return (0, index_1.initialize)({ key: validJWT }); }).not.toThrow();
+            expect(function () {
+                (0, index_1.initialize)({
+                    key: "api_key",
+                });
+            }).toThrow(index_1.ChirpierError);
+            expect(function () {
+                (0, index_1.initialize)({
+                    key: "api_key",
+                });
+            }).toThrow("Invalid API key: Not a valid JWT");
         });
     });
     describe("monitor", function () {
         test("event should be sent", function () { return __awaiter(void 0, void 0, void 0, function () {
-            var mock, validJWT, event;
+            var mock, event;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        chirpier = new index_1.Chirpier({
-                            key: "api_key",
-                        });
                         mock = new axios_mock_adapter_1.default(axios_1.default);
                         mock.onPost(constants_1.DEFAULT_API_ENDPOINT).reply(200, { success: true });
-                        validJWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
-                        (0, index_1.initialize)({ key: validJWT });
+                        (0, index_1.initialize)({
+                            key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
+                        });
                         event = {
                             group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-                            stream: "test-stream",
+                            stream_name: "test-stream",
                             value: 1,
                         };
-                        return [4 /*yield*/, chirpier.monitor(event)];
+                        (0, index_1.monitor)(event);
+                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 2000); })];
                     case 1:
-                        _a.sent();
-                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 1000); })];
-                    case 2:
                         _a.sent(); // Wait for flush
                         expect(mock.history.post.length).toBe(1);
                         expect(mock.history.post[0].url).toBe(constants_1.DEFAULT_API_ENDPOINT);
                         expect(JSON.parse(mock.history.post[0].data)).toEqual([
                             {
                                 group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-                                stream: "test-stream",
+                                stream_name: "test-stream",
                                 value: 1,
                             },
                         ]);
                         // Clean up the mock
                         mock.reset();
+                        index_1.Chirpier.stop();
                         return [2 /*return*/];
                 }
             });
         }); });
         test("should throw error for invalid event", function () { return __awaiter(void 0, void 0, void 0, function () {
-            var invalidEvent, mock;
+            var chirpier, invalidEvent;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        chirpier = new index_1.Chirpier({
-                            key: "api_key",
+                        (0, index_1.initialize)({
+                            key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
                         });
+                        chirpier = index_1.Chirpier.getInstance({});
                         invalidEvent = {
                             group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
                         };
-                        return [4 /*yield*/, expect(chirpier.monitor(invalidEvent)).rejects.toThrow(index_1.ChirpierError)];
+                        return [4 /*yield*/, expect(chirpier === null || chirpier === void 0 ? void 0 : chirpier.monitor(invalidEvent)).rejects.toThrow(index_1.ChirpierError)];
                     case 1:
                         _a.sent();
-                        mock = new axios_mock_adapter_1.default(axios_1.default);
-                        mock.reset();
+                        // Clean up the mock
+                        index_1.Chirpier.stop();
                         return [2 /*return*/];
                 }
             });
         }); });
         test("should batch events and flush when batch size is reached", function () { return __awaiter(void 0, void 0, void 0, function () {
-            var mock, validJWT, event;
+            var mock, event;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         mock = new axios_mock_adapter_1.default(axios_1.default);
                         mock.onPost(constants_1.DEFAULT_API_ENDPOINT).reply(200, { success: true });
-                        validJWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
-                        (0, index_1.initialize)({ key: validJWT, batchSize: 2 });
+                        (0, index_1.initialize)({
+                            key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
+                        });
                         event = {
                             group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-                            stream: "test-stream",
+                            stream_name: "test-stream",
                             value: 1,
                         };
                         (0, index_1.monitor)(event);
                         (0, index_1.monitor)(event);
-                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 100); })];
+                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 2000); })];
                     case 1:
                         _a.sent(); // Wait for flush
                         expect(mock.history.post.length).toBe(1);
                         expect(JSON.parse(mock.history.post[0].data).length).toBe(2);
                         mock.reset();
+                        index_1.Chirpier.stop();
                         return [2 /*return*/];
                 }
             });
         }); });
         test("should flush events after interval", function () { return __awaiter(void 0, void 0, void 0, function () {
-            var mock, validJWT, event;
+            var mock, event;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         mock = new axios_mock_adapter_1.default(axios_1.default);
                         mock.onPost(constants_1.DEFAULT_API_ENDPOINT).reply(200, { success: true });
-                        validJWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
-                        (0, index_1.initialize)({ key: validJWT, flushInterval: 100 });
+                        (0, index_1.initialize)({
+                            key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
+                        });
                         event = {
                             group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-                            stream: "test-stream",
+                            stream_name: "test-stream",
                             value: 1,
                         };
                         (0, index_1.monitor)(event);
-                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 1000); })];
+                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 2000); })];
                     case 1:
                         _a.sent(); // Wait for flush
                         expect(mock.history.post.length).toBe(1);
                         expect(JSON.parse(mock.history.post[0].data).length).toBe(1);
                         mock.reset();
-                        return [2 /*return*/];
-                }
-            });
-        }); });
-        test("should use provided event_id if available", function () { return __awaiter(void 0, void 0, void 0, function () {
-            var mock, validJWT, event;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        mock = new axios_mock_adapter_1.default(axios_1.default);
-                        mock.onPost(constants_1.DEFAULT_API_ENDPOINT).reply(200, { success: true });
-                        validJWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
-                        (0, index_1.initialize)({ key: validJWT });
-                        event = {
-                            group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-                            stream: "test-stream",
-                            value: 1,
-                            event_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-                        };
-                        (0, index_1.monitor)(event);
-                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 1000); })];
-                    case 1:
-                        _a.sent(); // Wait for flush
-                        expect(mock.history.post.length).toBe(1);
-                        expect(JSON.parse(mock.history.post[0].data)[0].event_id).toBe("f3438ee9-b964-48aa-b938-a803df440a3c");
-                        mock.reset();
-                        return [2 /*return*/];
-                }
-            });
-        }); });
-        test("should generate event_id if not provided", function () { return __awaiter(void 0, void 0, void 0, function () {
-            var mock, validJWT, event;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        mock = new axios_mock_adapter_1.default(axios_1.default);
-                        mock.onPost(constants_1.DEFAULT_API_ENDPOINT).reply(200, { success: true });
-                        uuid_1.v4.mockReturnValue("generated-uuid");
-                        validJWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
-                        (0, index_1.initialize)({ key: validJWT });
-                        event = {
-                            group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-                            stream: "test-stream",
-                            value: 1,
-                        };
-                        (0, index_1.monitor)(event);
-                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 1000); })];
-                    case 1:
-                        _a.sent(); // Wait for flush
-                        expect(mock.history.post.length).toBe(1);
-                        expect(JSON.parse(mock.history.post[0].data)[0].event_id).toBe("generated-uuid");
-                        mock.reset();
+                        index_1.Chirpier.stop();
                         return [2 /*return*/];
                 }
             });

package/dist/constants.d.ts

@@ -1,4 +1,6 @@
-export declare const DEFAULT_API_ENDPOINT = "https://events.chirpier.co/api/events";
+export declare const DEFAULT_API_ENDPOINT = "https://events.chirpier.co/v1.0/events";
 export declare const DEFAULT_RETRIES = 30;
 export declare const DEFAULT_TIMEOUT = 5000;
+export declare const DEFAULT_BATCH_SIZE = 50;
+export declare const DEFAULT_FLUSH_DELAY = 500;
 //# sourceMappingURL=constants.d.ts.map

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,0CAA0C,CAAC;AAC5E,eAAO,MAAM,eAAe,KAAK,CAAC;AAClC,eAAO,MAAM,eAAe,OAAO,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,2CAA2C,CAAC;AAC7E,eAAO,MAAM,eAAe,KAAK,CAAC;AAClC,eAAO,MAAM,eAAe,OAAO,CAAA;AACnC,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,mBAAmB,MAAM,CAAC"}

package/dist/constants.js

@@ -1,7 +1,9 @@
 "use strict";
 // constants.ts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_TIMEOUT = exports.DEFAULT_RETRIES = exports.DEFAULT_API_ENDPOINT = void 0;
-exports.DEFAULT_API_ENDPOINT = 'https://events.chirpier.co/api/events';
+exports.DEFAULT_FLUSH_DELAY = exports.DEFAULT_BATCH_SIZE = exports.DEFAULT_TIMEOUT = exports.DEFAULT_RETRIES = exports.DEFAULT_API_ENDPOINT = void 0;
+exports.DEFAULT_API_ENDPOINT = 'https://events.chirpier.co/v1.0/events';
 exports.DEFAULT_RETRIES = 30;
 exports.DEFAULT_TIMEOUT = 5000;
+exports.DEFAULT_BATCH_SIZE = 50;
+exports.DEFAULT_FLUSH_DELAY = 500;

package/dist/index.d.ts

@@ -1,16 +1,10 @@
 interface Options {
     key: string;
-    apiEndpoint?: string;
-    retries?: number;
-    timeout?: number;
-    batchSize?: number;
-    flushInterval?: number;
 }
 export interface Event {
     group_id: string;
-    stream: string;
+    stream_name: string;
     value: number;
-    event_id?: string;
 }
 export declare class ChirpierError extends Error {
     constructor(message: string);
@@ -19,20 +13,27 @@ export declare class ChirpierError extends Error {
  * Main Chirpier class for monitoring events.
  */
 export declare class Chirpier {
+    private static instance;
     private readonly apiKey;
     private readonly apiEndpoint;
     private readonly retries;
     private readonly timeout;
     private readonly axiosInstance;
     private eventQueue;
-    private flushTimeout;
     private readonly batchSize;
-    private readonly flushInterval;
+    private readonly flushTimeout;
+    private flushTimeoutId;
     /**
      * Initializes a new instance of the Chirpier class.
      * @param options - Configuration options for the SDK.
      */
-    constructor({ key, apiEndpoint, retries, timeout, batchSize, flushInterval, }: Options);
+    private constructor();
+    /**
+     * Gets the singleton instance of Chirpier, creating it if it doesn't exist.
+     * @param options - Configuration options for the SDK.
+     * @returns The Chirpier instance.
+     */
+    static getInstance(options: Options): Chirpier | null;
     /**
      * Validates the event structure.
      * @param event - The event to validate.
@@ -53,6 +54,7 @@ export declare class Chirpier {
      * @param events - The array of events to send.
      */
     private sendEvents;
+    static stop(): void;
 }
 /**
  * Initializes the Chirpier SDK.

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAGD,MAAM,WAAW,KAAK;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAGD,qBAAa,aAAc,SAAQ,KAAK;gBAC1B,OAAO,EAAE,MAAM;CAK5B;AAED;;GAEG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,UAAU,CAAe;IACjC,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC;;;OAGG;gBACS,EACV,GAAG,EACH,WAAkC,EAClC,OAAyB,EACzB,OAAyB,EACzB,SAAe,EACf,aAAmB,GACpB,EAAE,OAAO;IAyCV;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAapB;;;OAGG;IACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BjD;;OAEG;YACW,UAAU;IA6BxB;;;OAGG;YACW,UAAU;CAGzB;AAwCD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAkBjD;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAS1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;CACb;AAGD,MAAM,WAAW,KAAK;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,qBAAa,aAAc,SAAQ,KAAK;gBAC1B,OAAO,EAAE,MAAM;CAK5B;AAED;;GAEG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAyB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,UAAU,CAAe;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,cAAc,CAA+B;IAErD;;;OAGG;IACH,OAAO;IA8CP;;;;OAIG;WACW,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI;IAO5D;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAapB;;;OAGG;IACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBjD;;OAEG;YACW,UAAU;IAqBxB;;;OAGG;YACW,UAAU;WAKV,IAAI,IAAI,IAAI;CAa3B;AAqCD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAkBjD;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAW1C"}

package/dist/index.js

@@ -14,17 +14,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -78,7 +67,6 @@ exports.monitor = exports.initialize = exports.Chirpier = exports.ChirpierError
 // Import necessary dependencies
 var axios_1 = __importDefault(require("axios"));
 var axios_retry_1 = __importDefault(require("axios-retry"));
-var uuid_1 = require("@lukeed/uuid");
 var js_base64_1 = require("js-base64");
 var constants_1 = require("./constants");
 // Custom error class for Chirpier-specific errors
@@ -101,19 +89,19 @@ var Chirpier = /** @class */ (function () {
      * Initializes a new instance of the Chirpier class.
      * @param options - Configuration options for the SDK.
      */
-    function Chirpier(_a) {
-        var key = _a.key, _b = _a.apiEndpoint, apiEndpoint = _b === void 0 ? constants_1.DEFAULT_API_ENDPOINT : _b, _c = _a.retries, retries = _c === void 0 ? constants_1.DEFAULT_RETRIES : _c, _d = _a.timeout, timeout = _d === void 0 ? constants_1.DEFAULT_TIMEOUT : _d, _e = _a.batchSize, batchSize = _e === void 0 ? 100 : _e, _f = _a.flushInterval, flushInterval = _f === void 0 ? 500 : _f;
+    function Chirpier(options) {
         this.eventQueue = [];
-        this.flushTimeout = null;
+        this.flushTimeoutId = null;
+        var key = options.key;
         if (!key || typeof key !== "string") {
             throw new ChirpierError("API key is required and must be a string");
         }
         this.apiKey = key;
-        this.apiEndpoint = apiEndpoint;
-        this.retries = retries;
-        this.timeout = timeout;
-        this.batchSize = batchSize;
-        this.flushInterval = flushInterval;
+        this.apiEndpoint = constants_1.DEFAULT_API_ENDPOINT;
+        this.retries = constants_1.DEFAULT_RETRIES;
+        this.timeout = constants_1.DEFAULT_TIMEOUT;
+        this.batchSize = constants_1.DEFAULT_BATCH_SIZE;
+        this.flushTimeout = constants_1.DEFAULT_FLUSH_DELAY;
         // Create axios instance with authorization header
         this.axiosInstance = axios_1.default.create({
             headers: { Authorization: "Bearer ".concat(this.apiKey) },
@@ -136,6 +124,17 @@ var Chirpier = /** @class */ (function () {
             shouldResetTimeout: true,
         });
     }
+    /**
+     * Gets the singleton instance of Chirpier, creating it if it doesn't exist.
+     * @param options - Configuration options for the SDK.
+     * @returns The Chirpier instance.
+     */
+    Chirpier.getInstance = function (options) {
+        if (!Chirpier.instance && options.key) {
+            Chirpier.instance = new Chirpier(options);
+        }
+        return Chirpier.instance;
+    };
     /**
      * Validates the event structure.
      * @param event - The event to validate.
@@ -145,8 +144,8 @@ var Chirpier = /** @class */ (function () {
         return (typeof event.group_id === "string" &&
             /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(event.group_id) &&
             event.group_id.trim().length > 0 &&
-            typeof event.stream === "string" &&
-            event.stream.trim().length > 0 &&
+            typeof event.stream_name === "string" &&
+            event.stream_name.trim().length > 0 &&
             typeof event.value === "number");
     };
     /**
@@ -155,24 +154,27 @@ var Chirpier = /** @class */ (function () {
      */
     Chirpier.prototype.monitor = function (event) {
         return __awaiter(this, void 0, void 0, function () {
-            var eventWithID;
             var _this = this;
             return __generator(this, function (_a) {
-                if (!this.apiKey) {
-                    throw new ChirpierError("Chirpier SDK must be initialized before calling monitor()");
-                }
-                if (!this.isValidEvent(event)) {
-                    throw new ChirpierError("Invalid event format. Must include group_id, stream, and numeric value.");
-                }
-                eventWithID = __assign(__assign({}, event), { event_id: event.event_id || (0, uuid_1.v4)() });
-                this.eventQueue.push(eventWithID);
-                if (this.eventQueue.length >= this.batchSize) {
-                    this.flushQueue();
-                }
-                else if (!this.flushTimeout) {
-                    this.flushTimeout = setTimeout(function () { return _this.flushQueue(); }, this.flushInterval);
+                switch (_a.label) {
+                    case 0:
+                        if (!this.isValidEvent(event)) {
+                            throw new ChirpierError("Invalid event format. Must include group_id, stream_name, and numeric value.");
+                        }
+                        this.eventQueue.push(event);
+                        if (!(this.eventQueue.length >= this.batchSize)) return [3 /*break*/, 2];
+                        console.info("Batch size reached. Flushing queue.");
+                        return [4 /*yield*/, this.flushQueue()];
+                    case 1:
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        if (!this.flushTimeoutId) {
+                            this.flushTimeoutId = setTimeout(function () { return _this.flushQueue(); }, this.flushTimeout);
+                        }
+                        _a.label = 3;
+                    case 3: return [2 /*return*/];
                 }
-                return [2 /*return*/];
             });
         });
     };
@@ -182,17 +184,16 @@ var Chirpier = /** @class */ (function () {
     Chirpier.prototype.flushQueue = function () {
         return __awaiter(this, void 0, void 0, function () {
             var eventsToSend, error_1;
-            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        if (this.flushTimeoutId) {
+                            clearTimeout(this.flushTimeoutId);
+                            this.flushTimeoutId = null;
+                        }
                         if (this.eventQueue.length === 0) {
                             return [2 /*return*/];
                         }
-                        if (this.flushTimeout) {
-                            clearTimeout(this.flushTimeout);
-                            this.flushTimeout = null;
-                        }
                         eventsToSend = __spreadArray([], this.eventQueue, true);
                         this.eventQueue = [];
                         _a.label = 1;
@@ -207,12 +208,7 @@ var Chirpier = /** @class */ (function () {
                         error_1 = _a.sent();
                         console.error("Failed to send events:", error_1);
                         return [3 /*break*/, 4];
-                    case 4:
-                        // Schedule next flush if there are more events
-                        if (this.eventQueue.length > 0) {
-                            this.flushTimeout = setTimeout(function () { return _this.flushQueue(); }, this.flushInterval);
-                        }
-                        return [2 /*return*/];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -233,6 +229,21 @@ var Chirpier = /** @class */ (function () {
             });
         });
     };
+    // Stop the timeout and uninitialize the Chirpier instance
+    Chirpier.stop = function () {
+        if (!Chirpier.instance) {
+            return;
+        }
+        if (Chirpier.instance.flushTimeoutId) {
+            clearTimeout(Chirpier.instance.flushTimeoutId);
+            Chirpier.instance.flushTimeoutId = null;
+        }
+        // Flush any remaining events in the queue
+        Chirpier.instance.flushQueue();
+        // Uninitialize the Chirpier instance
+        Chirpier.instance = null;
+    };
+    Chirpier.instance = null;
     return Chirpier;
 }());
 exports.Chirpier = Chirpier;
@@ -270,8 +281,6 @@ function isValidJWT(token) {
         return false;
     }
 }
-// Singleton instance of Chirpier
-var chirpierInstance = null;
 /**
  * Initializes the Chirpier SDK.
  * @param options - Configuration options for the SDK.
@@ -281,7 +290,7 @@ function initialize(options) {
         throw new ChirpierError("Invalid API key: Not a valid JWT");
     }
     try {
-        chirpierInstance = new Chirpier(options);
+        Chirpier.getInstance(options);
     }
     catch (error) {
         if (error instanceof ChirpierError) {
@@ -299,10 +308,11 @@ exports.initialize = initialize;
  * @param event - The event to monitor.
  */
 function monitor(event) {
-    if (!chirpierInstance) {
+    var instance = Chirpier.getInstance({});
+    if (!instance) {
         throw new ChirpierError("Chirpier SDK is not initialized. Please call initialize() first.");
     }
-    chirpierInstance.monitor(event).catch(function (error) {
+    instance.monitor(event).catch(function (error) {
         console.error("Error in monitor function:", error);
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chirpier/chirpier-js",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Chirpier SDK for JavaScript",
   "keywords": [
     "chirpier",
@@ -27,7 +27,6 @@
     "test": "jest --coverage"
   },
   "dependencies": {
-    "@lukeed/uuid": "^2.0.1",
     "axios": "^0.24.0",
     "axios-retry": "^4.5.0",
     "js-base64": "^3.7.7",
@@ -35,15 +34,19 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.15.0",
     "@jest/globals": "^29.7.0",
     "@types/jest": "^29.5.13",
     "@types/mocha": "^10.0.8",
     "@types/node": "^22.7.5",
     "@types/uuid": "^10.0.0",
     "axios-mock-adapter": "^2.0.0",
+    "eslint": "^9.15.0",
+    "globals": "^15.12.0",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.4",
     "typescript": "^4.4.3",
+    "typescript-eslint": "^8.15.0",
     "webpack": "^5.52.0",
     "webpack-cli": "^4.8.0"
   }

package/src/__tests__/sdk.test.ts

@@ -1,222 +1,163 @@
 import { Chirpier, ChirpierError, Event, initialize, monitor } from "../index";
-import { DEFAULT_API_ENDPOINT, DEFAULT_RETRIES } from "../constants";
+import {
+  DEFAULT_API_ENDPOINT,
+  DEFAULT_RETRIES,
+  DEFAULT_TIMEOUT,
+  DEFAULT_BATCH_SIZE,
+  DEFAULT_FLUSH_DELAY,
+} from "../constants";
 import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
-import { cleanupMockServer } from "./mocks/server";
-import { v4 as uuidv4 } from "@lukeed/uuid";
-
-jest.mock("@lukeed/uuid");
 
 describe("Chirpier SDK", () => {
-  let chirpier: Chirpier;
-
-  afterEach(() => {
-    // Clean up mock server
-    cleanupMockServer();
-  });
-
   describe("Initialization", () => {
-    test("should initialize with default values", () => {
-      chirpier = new Chirpier({
-        key: "api_key",
-      });
-
-      // Setup mock server
-      const mock = new MockAdapter(axios);
-      mock.onPost(DEFAULT_API_ENDPOINT).reply(200, { success: true });
+    test("should throw error if monitor is called before initialize", () => {
+      const event: Event = {
+        group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
+        stream_name: "test-stream",
+        value: 1,
+      };
 
-      expect(chirpier["apiEndpoint"]).toBe(DEFAULT_API_ENDPOINT);
-      expect(chirpier["retries"]).toBe(DEFAULT_RETRIES);
+      expect(() => monitor(event)).toThrow(ChirpierError);
+      expect(() => monitor(event)).toThrow(
+        "Chirpier SDK is not initialized. Please call initialize() first."
+      );
     });
 
-    test("should initialize with custom values using mock server", () => {
-      chirpier = new Chirpier({
-        key: "api_key",
+    test("should initialize with default values", () => {
+      initialize({
+        key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
       });
+      const chirpier = Chirpier.getInstance({} as any);
 
       // Setup mock server
       const mock = new MockAdapter(axios);
       mock.onPost(DEFAULT_API_ENDPOINT).reply(200, { success: true });
 
-      const customChirpier = new Chirpier({
-        key: "api_key",
-        apiEndpoint: DEFAULT_API_ENDPOINT,
-        retries: 5,
-      });
+      expect(chirpier?.["apiEndpoint"]).toBe(DEFAULT_API_ENDPOINT);
+      expect(chirpier?.["retries"]).toBe(DEFAULT_RETRIES);
+      expect(chirpier?.["timeout"]).toBe(DEFAULT_TIMEOUT);
+      expect(chirpier?.["batchSize"]).toBe(DEFAULT_BATCH_SIZE);
+      expect(chirpier?.["flushTimeout"]).toBe(DEFAULT_FLUSH_DELAY);
 
-      expect(customChirpier["apiEndpoint"]).toBe(DEFAULT_API_ENDPOINT);
-      expect(customChirpier["retries"]).toBe(5);
+      Chirpier.stop();
     });
 
     test("should throw error if key is not provided", () => {
-      chirpier = new Chirpier({
-        key: "api_key",
-      });
-
-      // Setup mock server
-      const mock = new MockAdapter(axios);
-      mock.onPost(DEFAULT_API_ENDPOINT).reply(200, { success: true });
-
-      expect(() => new Chirpier({} as any)).toThrow(ChirpierError);
-    });
-
-    test("should throw error if key is not a valid JWT", () => {
-      expect(() => initialize({ key: "invalid_key" })).toThrow(ChirpierError);
-    });
-
-    test("should initialize successfully with a valid JWT", () => {
-      const validJWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
-      expect(() => initialize({ key: validJWT })).not.toThrow();
+      expect(() => {
+        initialize({
+          key: "api_key",
+        });
+      }).toThrow(ChirpierError);
+      expect(() => {
+        initialize({
+          key: "api_key",
+        });
+      }).toThrow("Invalid API key: Not a valid JWT");
     });
   });
 
   describe("monitor", () => {
     test("event should be sent", async () => {
-      chirpier = new Chirpier({
-        key: "api_key",
-      });
-
       // Setup mock server
       const mock = new MockAdapter(axios);
       mock.onPost(DEFAULT_API_ENDPOINT).reply(200, { success: true });
 
-      const validJWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
-      initialize({ key: validJWT });
-  
+      initialize({
+        key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
+      });
+
       const event: Event = {
         group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-        stream: "test-stream",
+        stream_name: "test-stream",
         value: 1,
       };
 
-      await chirpier.monitor(event);
+      monitor(event);
 
-      await new Promise(resolve => setTimeout(resolve, 1000)); // Wait for flush
+      await new Promise((resolve) => setTimeout(resolve, 2000)); // Wait for flush
 
       expect(mock.history.post.length).toBe(1);
       expect(mock.history.post[0].url).toBe(DEFAULT_API_ENDPOINT);
       expect(JSON.parse(mock.history.post[0].data)).toEqual([
         {
           group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-          stream: "test-stream",
+          stream_name: "test-stream",
           value: 1,
         },
       ]);
 
       // Clean up the mock
       mock.reset();
+      Chirpier.stop();
     });
 
     test("should throw error for invalid event", async () => {
-      chirpier = new Chirpier({
-        key: "api_key",
+      initialize({
+        key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
       });
+      const chirpier = Chirpier.getInstance({} as any);
+
       const invalidEvent = {
         group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
       } as any;
-      await expect(chirpier.monitor(invalidEvent)).rejects.toThrow(
+      await expect(chirpier?.monitor(invalidEvent)).rejects.toThrow(
         ChirpierError
       );
 
       // Clean up the mock
-      const mock = new MockAdapter(axios);
-      mock.reset();
+      Chirpier.stop();
     });
 
     test("should batch events and flush when batch size is reached", async () => {
       const mock = new MockAdapter(axios);
       mock.onPost(DEFAULT_API_ENDPOINT).reply(200, { success: true });
 
-      const validJWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
-      initialize({ key: validJWT, batchSize: 2 });
+      initialize({
+        key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
+      });
 
       const event: Event = {
         group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-        stream: "test-stream",
+        stream_name: "test-stream",
         value: 1,
       };
 
       monitor(event);
       monitor(event);
 
-      await new Promise(resolve => setTimeout(resolve, 100)); // Wait for flush
+      await new Promise((resolve) => setTimeout(resolve, 2000)); // Wait for flush
 
       expect(mock.history.post.length).toBe(1);
       expect(JSON.parse(mock.history.post[0].data).length).toBe(2);
 
       mock.reset();
+      Chirpier.stop();
     });
 
     test("should flush events after interval", async () => {
       const mock = new MockAdapter(axios);
       mock.onPost(DEFAULT_API_ENDPOINT).reply(200, { success: true });
 
-      const validJWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
-      initialize({ key: validJWT, flushInterval: 100 });
+      initialize({
+        key: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
+      });
 
       const event: Event = {
         group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-        stream: "test-stream",
+        stream_name: "test-stream",
         value: 1,
       };
 
       monitor(event);
 
-      await new Promise(resolve => setTimeout(resolve, 1000)); // Wait for flush
+      await new Promise((resolve) => setTimeout(resolve, 2000)); // Wait for flush
 
       expect(mock.history.post.length).toBe(1);
       expect(JSON.parse(mock.history.post[0].data).length).toBe(1);
 
       mock.reset();
-    });
-
-    test("should use provided event_id if available", async () => {
-      const mock = new MockAdapter(axios);
-      mock.onPost(DEFAULT_API_ENDPOINT).reply(200, { success: true });
-
-      const validJWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
-      initialize({ key: validJWT });
-
-      const event: Event = {
-        group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-        stream: "test-stream",
-        value: 1,
-        event_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-      };
-
-      monitor(event);
-
-      await new Promise(resolve => setTimeout(resolve, 1000)); // Wait for flush
-
-      expect(mock.history.post.length).toBe(1);
-      expect(JSON.parse(mock.history.post[0].data)[0].event_id).toBe("f3438ee9-b964-48aa-b938-a803df440a3c");
-
-      mock.reset();
-    });
-
-    test("should generate event_id if not provided", async () => {
-      const mock = new MockAdapter(axios);
-      mock.onPost(DEFAULT_API_ENDPOINT).reply(200, { success: true });
-
-      (uuidv4 as jest.Mock).mockReturnValue("generated-uuid");
-
-      const validJWT = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
-      initialize({ key: validJWT });
-
-      const event: Event = {
-        group_id: "f3438ee9-b964-48aa-b938-a803df440a3c",
-        stream: "test-stream",
-        value: 1,
-      };
-
-      monitor(event);
-
-      await new Promise(resolve => setTimeout(resolve, 1000)); // Wait for flush
-
-      expect(mock.history.post.length).toBe(1);
-      expect(JSON.parse(mock.history.post[0].data)[0].event_id).toBe("generated-uuid");
-
-      mock.reset();
+      Chirpier.stop();
     });
   });
-});
+});

package/src/constants.ts

@@ -1,5 +1,7 @@
 // constants.ts
 
-export const DEFAULT_API_ENDPOINT = 'https://events.chirpier.co/api/events';
+export const DEFAULT_API_ENDPOINT = 'https://events.chirpier.co/v1.0/events';
 export const DEFAULT_RETRIES = 30;
-export const DEFAULT_TIMEOUT = 5000
+export const DEFAULT_TIMEOUT = 5000
+export const DEFAULT_BATCH_SIZE = 50;
+export const DEFAULT_FLUSH_DELAY = 500;

package/src/index.ts

@@ -1,30 +1,25 @@
 // Import necessary dependencies
 import axios, { AxiosInstance } from "axios";
 import axiosRetry from "axios-retry";
-import { v4 as uuidv4 } from "@lukeed/uuid";
 import { Base64 } from "js-base64";
 import {
   DEFAULT_API_ENDPOINT,
   DEFAULT_RETRIES,
   DEFAULT_TIMEOUT,
+  DEFAULT_BATCH_SIZE,
+  DEFAULT_FLUSH_DELAY,
 } from "./constants";
 
 // Define the options interface for Chirpier initialization
 interface Options {
   key: string;
-  apiEndpoint?: string;
-  retries?: number;
-  timeout?: number;
-  batchSize?: number;
-  flushInterval?: number;
 }
 
 // Define the Event interface for monitoring
 export interface Event {
   group_id: string;
-  stream: string;
+  stream_name: string;
   value: number;
-  event_id?: string;
 }
 
 // Custom error class for Chirpier-specific errors
@@ -40,37 +35,36 @@ export class ChirpierError extends Error {
  * Main Chirpier class for monitoring events.
  */
 export class Chirpier {
+  private static instance: Chirpier | null = null;
   private readonly apiKey: string;
   private readonly apiEndpoint: string;
   private readonly retries: number;
   private readonly timeout: number;
   private readonly axiosInstance: AxiosInstance;
   private eventQueue: Event[] = [];
-  private flushTimeout: NodeJS.Timeout | null = null;
   private readonly batchSize: number;
-  private readonly flushInterval: number;
+  private readonly flushTimeout: number;
+  private flushTimeoutId: NodeJS.Timeout | null = null;
 
   /**
    * Initializes a new instance of the Chirpier class.
    * @param options - Configuration options for the SDK.
    */
-  constructor({
-    key,
-    apiEndpoint = DEFAULT_API_ENDPOINT,
-    retries = DEFAULT_RETRIES,
-    timeout = DEFAULT_TIMEOUT,
-    batchSize = 100,
-    flushInterval = 500,
-  }: Options) {
+  private constructor(options: Options) {
+    const {
+      key,
+    } = options;
+
     if (!key || typeof key !== "string") {
       throw new ChirpierError("API key is required and must be a string");
     }
+    
     this.apiKey = key;
-    this.apiEndpoint = apiEndpoint;
-    this.retries = retries;
-    this.timeout = timeout;
-    this.batchSize = batchSize;
-    this.flushInterval = flushInterval;
+    this.apiEndpoint = DEFAULT_API_ENDPOINT;
+    this.retries = DEFAULT_RETRIES;
+    this.timeout = DEFAULT_TIMEOUT;
+    this.batchSize = DEFAULT_BATCH_SIZE;
+    this.flushTimeout = DEFAULT_FLUSH_DELAY;
 
     // Create axios instance with authorization header
     this.axiosInstance = axios.create({
@@ -102,6 +96,18 @@ export class Chirpier {
     });
   }
 
+  /**
+   * Gets the singleton instance of Chirpier, creating it if it doesn't exist.
+   * @param options - Configuration options for the SDK.
+   * @returns The Chirpier instance.
+   */
+  public static getInstance(options: Options): Chirpier | null {
+    if (!Chirpier.instance && options.key) {
+      Chirpier.instance = new Chirpier(options);
+    }
+    return Chirpier.instance;
+  }
+
   /**
    * Validates the event structure.
    * @param event - The event to validate.
@@ -114,8 +120,8 @@ export class Chirpier {
         event.group_id
       ) &&
       event.group_id.trim().length > 0 &&
-      typeof event.stream === "string" &&
-      event.stream.trim().length > 0 &&
+      typeof event.stream_name === "string" &&
+      event.stream_name.trim().length > 0 &&
       typeof event.value === "number"
     );
   }
@@ -125,28 +131,19 @@ export class Chirpier {
    * @param event - The event to monitor.
    */
   public async monitor(event: Event): Promise<void> {
-    if (!this.apiKey) {
-      throw new ChirpierError("Chirpier SDK must be initialized before calling monitor()");
-    }
-
     if (!this.isValidEvent(event)) {
       throw new ChirpierError(
-        "Invalid event format. Must include group_id, stream, and numeric value."
+        "Invalid event format. Must include group_id, stream_name, and numeric value."
       );
     }
 
-    // Ensure event_id is only set once
-    const eventWithID = { ...event, event_id: event.event_id || uuidv4() };
-
-    this.eventQueue.push(eventWithID);
+    this.eventQueue.push(event);
 
     if (this.eventQueue.length >= this.batchSize) {
-      this.flushQueue();
-    } else if (!this.flushTimeout) {
-      this.flushTimeout = setTimeout(
-        () => this.flushQueue(),
-        this.flushInterval
-      );
+      console.info(`Batch size reached. Flushing queue.`);
+      await this.flushQueue();
+    } else if (!this.flushTimeoutId) {
+      this.flushTimeoutId = setTimeout(() => this.flushQueue(), this.flushTimeout);
     }
   }
 
@@ -154,14 +151,14 @@ export class Chirpier {
    * Flushes the event queue by sending all events to the API.
    */
   private async flushQueue(): Promise<void> {
+    if (this.flushTimeoutId) {
+      clearTimeout(this.flushTimeoutId);
+      this.flushTimeoutId = null;
+    }
+
     if (this.eventQueue.length === 0) {
       return;
     }
-    
-    if (this.flushTimeout) {
-      clearTimeout(this.flushTimeout);
-      this.flushTimeout = null;
-    }
 
     const eventsToSend = [...this.eventQueue];
     this.eventQueue = [];
@@ -172,14 +169,6 @@ export class Chirpier {
     } catch (error) {
       console.error("Failed to send events:", error);
     }
-
-    // Schedule next flush if there are more events
-    if (this.eventQueue.length > 0) {
-      this.flushTimeout = setTimeout(
-        () => this.flushQueue(),
-        this.flushInterval
-      );
-    }
   }
 
   /**
@@ -189,6 +178,21 @@ export class Chirpier {
   private async sendEvents(events: Event[]): Promise<void> {
     await this.axiosInstance.post(this.apiEndpoint, events);
   }
+  
+  // Stop the timeout and uninitialize the Chirpier instance
+  public static stop(): void {
+    if (!Chirpier.instance) {
+      return;
+    }
+    if (Chirpier.instance.flushTimeoutId) {
+      clearTimeout(Chirpier.instance.flushTimeoutId);
+      Chirpier.instance.flushTimeoutId = null;
+    }
+    // Flush any remaining events in the queue
+    Chirpier.instance.flushQueue();
+    // Uninitialize the Chirpier instance
+    Chirpier.instance = null;
+  }
 }
 
 /**
@@ -226,9 +230,6 @@ function isValidJWT(token: string): boolean {
   }
 }
 
-// Singleton instance of Chirpier
-let chirpierInstance: Chirpier | null = null;
-
 /**
  * Initializes the Chirpier SDK.
  * @param options - Configuration options for the SDK.
@@ -239,7 +240,7 @@ export function initialize(options: Options): void {
   }
 
   try {
-    chirpierInstance = new Chirpier(options);
+    Chirpier.getInstance(options);
   } catch (error) {
     if (error instanceof ChirpierError) {
       console.error("Failed to initialize Chirpier SDK:", error.message);
@@ -258,12 +259,14 @@ export function initialize(options: Options): void {
  * @param event - The event to monitor.
  */
 export function monitor(event: Event): void {
-  if (!chirpierInstance) {
+  const instance = Chirpier.getInstance({} as Options);
+  if (!instance) {
     throw new ChirpierError(
       "Chirpier SDK is not initialized. Please call initialize() first."
     );
   }
-  chirpierInstance.monitor(event).catch((error) => {
+  
+  instance.monitor(event).catch((error) => {
     console.error("Error in monitor function:", error);
   });
 }

package/src/__tests__/mocks/server.ts

@@ -1,6 +0,0 @@
-import axios from "axios";
-
-// Cleanup mock server after tests
-export function cleanupMockServer() {
-  axios.defaults.adapter = undefined;
-}