@eyevinn/player-analytics-shared 0.6.0 → 0.7.1

package/adapters/db/ClickHouseDBAdapter.ts

@@ -0,0 +1,143 @@
+import { createClient } from '@clickhouse/client';
+import { AbstractDBAdapter, ErrorType, IGetItemInput, IGetItems, IHandleErrorOutput, IPutItemInput } from '../../types/interfaces';
+import winston from 'winston';
+
+interface EventItem {
+  event: string;
+  sessionId: string;
+  timestamp: number;
+  playhead: number;
+  duration: number;
+  payload: string;
+}
+
+export class ClickHouseDBAdapter implements AbstractDBAdapter {
+  logger: winston.Logger;
+  dbClient: any;
+
+  constructor(logger: winston.Logger) {
+    this.logger = logger;
+    this.dbClient = createClient({
+      url: process.env.CLICKHOUSE_URL
+    });
+  }
+
+  async tableExists(name: string): Promise<boolean> {
+    try {
+      const query = `SELECT 1 FROM system.tables WHERE database = currentDatabase() AND name = '${name}'`;
+      const resultSet = await this.dbClient.query({
+        query,
+        format: 'JSONEachRow'
+      });
+      
+      const rows = await resultSet.json();
+      if (rows.length > 0) {
+        return true;
+      } else {
+        // Create table if it does not exists
+        const createTableQuery = `
+        CREATE TABLE IF NOT EXISTS ${name} (
+          event String,
+          sessionId String,
+          timestamp DateTime64(3),
+          playhead Float64,
+          duration Float64,
+          live Boolean,
+          contentId String,
+          userId String,
+          deviceId String,
+          deviceModel String,
+          deviceType String,
+          payload String, /* Stored as JSON string */
+          
+          /* Add derived columns for better query performance */
+          event_date Date DEFAULT toDate(timestamp),
+          event_hour DateTime DEFAULT toStartOfHour(timestamp)
+        )
+        ENGINE = MergeTree()
+        PARTITION BY toYYYYMM(timestamp)
+        ORDER BY (sessionId, timestamp)
+      `;
+      
+      await this.dbClient.query({
+        query: createTableQuery
+      });
+      
+      this.logger.info(`Table '${name}' created successfully.`);
+      return true;
+      }
+    } catch (err) {
+      this.logger.error(`Error checking if table '${name}' exists:`);
+      this.logger.error(err);
+      return false;
+    }
+  }
+
+  async putItem(params: IPutItemInput): Promise<boolean> {
+    const tableName = params.tableName;
+    const item = params.data as EventItem;
+
+    // Prepare the item for insertion
+    this.logger.debug(item);
+    
+    // Convert payload to JSON string if it's an object
+    const payload = typeof item.payload === 'object' 
+      ? JSON.stringify(item.payload) 
+      : item.payload || '';
+    
+    // Prepare the data for insertion
+    let parsedPayload = {};
+    if (payload) {
+      try {
+        parsedPayload = JSON.parse(payload);
+      } catch (error) {
+        this.logger.warn('Payload not json, skipping parsing');
+      }
+    }
+    const data = [{
+      event: item.event,
+      sessionId: item.sessionId,
+      timestamp: item.timestamp,
+      playhead: item.playhead || -1,
+      duration: item.duration || -1,
+      live: parsedPayload['live'] || false,
+      contentId: parsedPayload['contentId'] || '',
+      userId: parsedPayload['userId'] || '',
+      deviceId: parsedPayload['deviceId'] || '',
+      deviceModel: parsedPayload['deviceModel'] || '',
+      deviceType: parsedPayload['deviceType'] || '',
+      payload
+    }];
+    
+    // Insert the data
+    await this.dbClient.insert({
+      table: tableName,
+      values: data,
+      format: 'JSONEachRow'
+    });
+    
+    this.logger.debug(`Successfully inserted item into ${tableName}`);
+    return true;
+  }
+
+  async getItem(params: IGetItemInput): Promise<any> {
+    throw new Error('Method not implemented.');
+  }
+
+  async deleteItem(params: IGetItemInput): Promise<boolean> {
+    throw new Error('Method not implemented.');
+  }
+
+  async getItemsBySession(params: IGetItems): Promise<any[]> {
+    throw new Error('Method not implemented.');
+  }
+
+  handleError(errorObject: any): IHandleErrorOutput {
+    this.logger.error(errorObject);
+    const errorOutput: IHandleErrorOutput = {
+      errorType: ErrorType.ABORT,
+      error: errorObject,
+    };
+    return errorOutput;
+  }
+}

package/adapters/queue/SqsQueueAdapter.ts

@@ -7,6 +7,8 @@ import {
   DeleteMessageCommandInput,
   Message,
   DeleteMessageCommand,
+  paginateListQueues,
+  CreateQueueCommand,
 } from '@aws-sdk/client-sqs';
 import { AbstractQueueAdapter } from '../../types/interfaces';
 import winston from 'winston';
@@ -14,6 +16,8 @@ import winston from 'winston';
 export class SqsQueueAdapter implements AbstractQueueAdapter {
   logger: winston.Logger;
   client: SQSClient;
+  queueUrl: string;
+  queueExists: boolean = false;
 
   constructor(logger: winston.Logger) {
     this.logger = logger;
@@ -23,14 +27,45 @@ export class SqsQueueAdapter implements AbstractQueueAdapter {
     } else {
       region = process.env.AWS_REGION;
     }
+    this.queueUrl = process.env.SQS_QUEUE_URL!;
     this.logger.info(`SQS Region: ${region}`);
     this.client = new SQSClient({ region: region, endpoint: process.env.SQS_ENDPOINT });
   }
 
+  private async checkQueueExists(): Promise<boolean> {
+    const paginatedQueues = paginateListQueues({ client: this.client }, {});
+    const queues: string[] = [];
+
+    for await (const page of paginatedQueues) {
+      if (page.QueueUrls?.length) {
+        queues.push(...page.QueueUrls);
+      }
+    }
+    return queues.find((queue) => queue === this.queueUrl) ? true : false;
+  }
+
+  private async createQueue() {
+    const command = new CreateQueueCommand({
+      QueueName: new URL(this.queueUrl).pathname.split('/').pop()
+    });
+    const response = await this.client.send(command);
+    this.logger.info(`Queue created: ${response.QueueUrl} (expected ${this.queueUrl})`);
+  }
+
   async pushToQueue(event: Object): Promise<any> {
-    if (process.env.SQS_QUEUE_URL === 'undefined') {
+    if (this.queueUrl === 'undefined') {
       return { message: 'SQS_QUEUE_URL is undefined' };
     }
+    if (!this.queueExists) {
+      this.logger.info('Checking if queue exists');
+      if (!(await this.checkQueueExists())) {
+        this.logger.error('Queue does not exist, creating queue');
+        await this.createQueue();
+        this.queueExists = true;
+      } else {
+        this.queueExists = true;
+      }
+    }
     const params: SendMessageCommandInput = {
       MessageAttributes: {
         Event: {

package/build/adapters/db/ClickHouseDBAdapter.d.ts

@@ -0,0 +1,13 @@
+import { AbstractDBAdapter, IGetItemInput, IGetItems, IHandleErrorOutput, IPutItemInput } from '../../types/interfaces';
+import winston from 'winston';
+export declare class ClickHouseDBAdapter implements AbstractDBAdapter {
+    logger: winston.Logger;
+    dbClient: any;
+    constructor(logger: winston.Logger);
+    tableExists(name: string): Promise<boolean>;
+    putItem(params: IPutItemInput): Promise<boolean>;
+    getItem(params: IGetItemInput): Promise<any>;
+    deleteItem(params: IGetItemInput): Promise<boolean>;
+    getItemsBySession(params: IGetItems): Promise<any[]>;
+    handleError(errorObject: any): IHandleErrorOutput;
+}

package/build/adapters/db/ClickHouseDBAdapter.js

@@ -0,0 +1,142 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClickHouseDBAdapter = void 0;
+const client_1 = require("@clickhouse/client");
+const interfaces_1 = require("../../types/interfaces");
+class ClickHouseDBAdapter {
+    constructor(logger) {
+        this.logger = logger;
+        this.dbClient = (0, client_1.createClient)({
+            url: process.env.CLICKHOUSE_URL
+        });
+    }
+    tableExists(name) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const query = `SELECT 1 FROM system.tables WHERE database = currentDatabase() AND name = '${name}'`;
+                const resultSet = yield this.dbClient.query({
+                    query,
+                    format: 'JSONEachRow'
+                });
+                const rows = yield resultSet.json();
+                if (rows.length > 0) {
+                    return true;
+                }
+                else {
+                    // Create table if it does not exists
+                    const createTableQuery = `
+        CREATE TABLE IF NOT EXISTS ${name} (
+          event String,
+          sessionId String,
+          timestamp DateTime64(3),
+          playhead Float64,
+          duration Float64,
+          live Boolean,
+          contentId String,
+          userId String,
+          deviceId String,
+          deviceModel String,
+          deviceType String,
+          payload String, /* Stored as JSON string */
+          
+          /* Add derived columns for better query performance */
+          event_date Date DEFAULT toDate(timestamp),
+          event_hour DateTime DEFAULT toStartOfHour(timestamp)
+        )
+        ENGINE = MergeTree()
+        PARTITION BY toYYYYMM(timestamp)
+        ORDER BY (sessionId, timestamp)
+      `;
+                    yield this.dbClient.query({
+                        query: createTableQuery
+                    });
+                    this.logger.info(`Table '${name}' created successfully.`);
+                    return true;
+                }
+            }
+            catch (err) {
+                this.logger.error(`Error checking if table '${name}' exists:`);
+                this.logger.error(err);
+                return false;
+            }
+        });
+    }
+    putItem(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tableName = params.tableName;
+            const item = params.data;
+            // Prepare the item for insertion
+            this.logger.debug(item);
+            // Convert payload to JSON string if it's an object
+            const payload = typeof item.payload === 'object'
+                ? JSON.stringify(item.payload)
+                : item.payload || '';
+            // Prepare the data for insertion
+            let parsedPayload = {};
+            if (payload) {
+                try {
+                    parsedPayload = JSON.parse(payload);
+                }
+                catch (error) {
+                    this.logger.warn('Payload not json, skipping parsing');
+                }
+            }
+            const data = [{
+                    event: item.event,
+                    sessionId: item.sessionId,
+                    timestamp: item.timestamp,
+                    playhead: item.playhead || -1,
+                    duration: item.duration || -1,
+                    live: parsedPayload['live'] || false,
+                    contentId: parsedPayload['contentId'] || '',
+                    userId: parsedPayload['userId'] || '',
+                    deviceId: parsedPayload['deviceId'] || '',
+                    deviceModel: parsedPayload['deviceModel'] || '',
+                    deviceType: parsedPayload['deviceType'] || '',
+                    payload
+                }];
+            // Insert the data
+            yield this.dbClient.insert({
+                table: tableName,
+                values: data,
+                format: 'JSONEachRow'
+            });
+            this.logger.debug(`Successfully inserted item into ${tableName}`);
+            return true;
+        });
+    }
+    getItem(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('Method not implemented.');
+        });
+    }
+    deleteItem(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('Method not implemented.');
+        });
+    }
+    getItemsBySession(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('Method not implemented.');
+        });
+    }
+    handleError(errorObject) {
+        this.logger.error(errorObject);
+        const errorOutput = {
+            errorType: interfaces_1.ErrorType.ABORT,
+            error: errorObject,
+        };
+        return errorOutput;
+    }
+}
+exports.ClickHouseDBAdapter = ClickHouseDBAdapter;
+//# sourceMappingURL=ClickHouseDBAdapter.js.map

package/build/adapters/db/ClickHouseDBAdapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClickHouseDBAdapter.js","sourceRoot":"","sources":["../../../adapters/db/ClickHouseDBAdapter.ts"],"names":[],"mappings":"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"}

package/build/adapters/queue/SqsQueueAdapter.d.ts

@@ -4,7 +4,11 @@ import winston from 'winston';
 export declare class SqsQueueAdapter implements AbstractQueueAdapter {
     logger: winston.Logger;
     client: SQSClient;
+    queueUrl: string;
+    queueExists: boolean;
     constructor(logger: winston.Logger);
+    private checkQueueExists;
+    private createQueue;
     pushToQueue(event: Object): Promise<any>;
     pullFromQueue(): Promise<any>;
     removeFromQueue(queueMsg: Message): Promise<any>;

package/build/adapters/queue/SqsQueueAdapter.js

@@ -8,11 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqsQueueAdapter = void 0;
 const client_sqs_1 = require("@aws-sdk/client-sqs");
 class SqsQueueAdapter {
     constructor(logger) {
+        this.queueExists = false;
         this.logger = logger;
         let region;
         if ('QUEUE_REGION' in process.env) {
@@ -21,14 +29,59 @@ class SqsQueueAdapter {
         else {
             region = process.env.AWS_REGION;
         }
+        this.queueUrl = process.env.SQS_QUEUE_URL;
         this.logger.info(`SQS Region: ${region}`);
         this.client = new client_sqs_1.SQSClient({ region: region, endpoint: process.env.SQS_ENDPOINT });
     }
+    checkQueueExists() {
+        var e_1, _a;
+        var _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const paginatedQueues = (0, client_sqs_1.paginateListQueues)({ client: this.client }, {});
+            const queues = [];
+            try {
+                for (var paginatedQueues_1 = __asyncValues(paginatedQueues), paginatedQueues_1_1; paginatedQueues_1_1 = yield paginatedQueues_1.next(), !paginatedQueues_1_1.done;) {
+                    const page = paginatedQueues_1_1.value;
+                    if ((_b = page.QueueUrls) === null || _b === void 0 ? void 0 : _b.length) {
+                        queues.push(...page.QueueUrls);
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (paginatedQueues_1_1 && !paginatedQueues_1_1.done && (_a = paginatedQueues_1.return)) yield _a.call(paginatedQueues_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            return queues.find((queue) => queue === this.queueUrl) ? true : false;
+        });
+    }
+    createQueue() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const command = new client_sqs_1.CreateQueueCommand({
+                QueueName: new URL(this.queueUrl).pathname.split('/').pop()
+            });
+            const response = yield this.client.send(command);
+            this.logger.info(`Queue created: ${response.QueueUrl} (expected ${this.queueUrl})`);
+        });
+    }
     pushToQueue(event) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (process.env.SQS_QUEUE_URL === 'undefined') {
+            if (this.queueUrl === 'undefined') {
                 return { message: 'SQS_QUEUE_URL is undefined' };
             }
+            if (!this.queueExists) {
+                this.logger.info('Checking if queue exists');
+                if (!(yield this.checkQueueExists())) {
+                    this.logger.error('Queue does not exist, creating queue');
+                    yield this.createQueue();
+                    this.queueExists = true;
+                }
+                else {
+                    this.queueExists = true;
+                }
+            }
             const params = {
                 MessageAttributes: {
                     Event: {

package/build/adapters/queue/SqsQueueAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqsQueueAdapter.js","sourceRoot":"","sources":["../../../adapters/queue/SqsQueueAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SqsQueueAdapter.js","sourceRoot":"","sources":["../../../adapters/queue/SqsQueueAdapter.ts"],"names":[],"mappings":"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"}

package/build/index.d.ts

@@ -3,4 +3,5 @@ export * from './adapters/queue/BeanstalkdAdapter';
 export * from './adapters/queue/RedisAdapter';
 export * from './adapters/db/DynamoDBAdapter';
 export * from './adapters/db/MongoDBAdapter';
+export * from './adapters/db/ClickHouseDBAdapter';
 export * from './util/constants';

package/build/index.js

@@ -15,5 +15,6 @@ __exportStar(require("./adapters/queue/BeanstalkdAdapter"), exports);
 __exportStar(require("./adapters/queue/RedisAdapter"), exports);
 __exportStar(require("./adapters/db/DynamoDBAdapter"), exports);
 __exportStar(require("./adapters/db/MongoDBAdapter"), exports);
+__exportStar(require("./adapters/db/ClickHouseDBAdapter"), exports);
 __exportStar(require("./util/constants"), exports);
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAAiD;AACjD,qEAAmD;AACnD,gEAA8C;AAE9C,gEAA8C;AAC9C,+DAA6C;AAE7C,mDAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mEAAiD;AACjD,qEAAmD;AACnD,gEAA8C;AAE9C,gEAA8C;AAC9C,+DAA6C;AAC7C,oEAAkD;AAElD,mDAAiC"}

package/index.ts

@@ -4,5 +4,6 @@ export * from './adapters/queue/RedisAdapter';
 
 export * from './adapters/db/DynamoDBAdapter';
 export * from './adapters/db/MongoDBAdapter';
+export * from './adapters/db/ClickHouseDBAdapter';
 
 export * from './util/constants';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eyevinn/player-analytics-shared",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "Shared modules & adapters for EPAS components",
   "source": "index.ts",
   "main": "./build/index.js",
@@ -29,6 +29,7 @@
     "@aws-sdk/client-dynamodb": "^3.751.0",
     "@aws-sdk/client-sqs": "^3.750.0",
     "@aws-sdk/util-dynamodb": "^3.44.0",
+    "@clickhouse/client": "^1.10.1",
     "@types/jasmine": "^3.10.2",
     "@types/node": "^16.6.1",
     "aws-sdk-client-mock": "^4.1.0",

package/spec/adapters/SqsQueueAdapter.spec.ts

@@ -36,6 +36,8 @@ describe('SQS Queue Adapter', () => {
       playhead: 0,
       duration: 0,
     };
+    // Using any type assertion to bypass TypeScript's type checking on spyOn
+    spyOn(adapter as any, 'checkQueueExists').and.returnValue(true);
     sqsMock.on(SendMessageCommand).resolves(sqsResp);
     const result = await adapter.pushToQueue(event);
     expect(result).toEqual(sqsResp);
@@ -52,6 +54,8 @@ describe('SQS Queue Adapter', () => {
       playhead: 0,
       duration: 0,
     };
+    // Using any type assertion to bypass TypeScript's type checking on spyOn
+    spyOn(adapter as any, 'checkQueueExists').and.returnValue(true);
     sqsMock.on(SendMessageCommand).resolves(sqsResp);
     const result = await adapter.pushToQueue(event);
     expect(result).toEqual(sqsResp);
@@ -139,6 +143,10 @@ describe('SQS Queue Adapter', () => {
     sqsMock.on(ReceiveMessageCommand).rejects(errMsg);
     sqsMock.on(DeleteMessageCommand).rejects(errMsg);
     const queueAdapter = new SqsQueueAdapter(Logger);
+    
+    // Using any type assertion to bypass TypeScript's type checking on spyOn
+    spyOn(queueAdapter as any, 'checkQueueExists').and.returnValue(true);
+
     let pushResult = await queueAdapter.pushToQueue(mockEvent);
     let readResult = await queueAdapter.pullFromQueue();
     let removeResult = await queueAdapter.removeFromQueue(mockSQSMessage);