Refactor logger enums and update aggregator config

package.json

@@ -32,7 +32,6 @@
         "eslint-plugin-jsdoc": "^48.0.6",
         "jest": "^29.3.1",
         "ldfetch": "^1.2.8",
-        "rsp-js": "^1.1.2",
         "ts-jest": "^29.0.3",
         "typescript": "^4.9.4"
     },
@@ -44,6 +43,7 @@
         "css-auth-login": "^1.0.8",
         "rate-limited-ldp-communication": "^1.0.5",
         "rdflib": "^2.2.31",
+        "rsp-js": "file:../RSP/RSP-JS",
         "rspql-query-equivalence": "^1.0.3",
         "sparqljs": "^3.6.2",
         "tslog": "^4.8.2",

src/config/aggregator_config.json

@@ -1,4 +1,4 @@
 {
-    "aggregation_pod_ldes_location" : "http://localhost:3000/aggregation_pod/aggregation/",
+    "aggregation_pod_ldes_location" : "http://localhost:3000/aggregation_pod/",
     "aggregator_rate_limit": 30
 }

src/index.ts

@@ -1,27 +1,15 @@
 import { HTTPServer } from "./server/HTTPServer";
 import * as bunyan from 'bunyan';
 import * as fs from 'fs';
-import * as path from 'path';
 
 function getTimestamp() {
     const now = new Date();
     return `${now.getFullYear()}-${(now.getMonth() + 1).toString().padStart(2, '0')}-${now.getDate().toString().padStart(2, '0')}-${now.getHours().toString().padStart(2, '0')}-${now.getMinutes().toString().padStart(2, '0')}-${now.getSeconds().toString().padStart(2, '0')}`;
 }
 
-function getAndUpdateIteration() {
-    const iterationFilePath = path.join(__dirname, '/logs/iteration.txt');
-    let iteration = 1;
-    if (fs.existsSync(iterationFilePath)) {
-        iteration = parseInt(fs.readFileSync(iterationFilePath, 'utf8'), 10) + 1;
-    }
-    fs.writeFileSync(iterationFilePath, iteration.toString());
-    return iteration;
-}
-
-const iteration = getAndUpdateIteration();
 const timestamp = getTimestamp();
 
-const log_file = fs.createWriteStream(`aggregator-${iteration}-${timestamp}.log`, { flags: 'a' });
+const log_file = fs.createWriteStream(`aggregator-${timestamp}.log`, { flags: 'a' });
 
 const logger = bunyan.createLogger({
     name: 'solid-stream-aggregator',

src/server/HTTPServer.ts

@@ -43,7 +43,7 @@ export class HTTPServer {
         this.websocket_handler.handle_wss();
         this.websocket_handler.aggregation_event_publisher();
         this.logger.info({}, 'http_server_started');
-        console.log('HTTP Server started on port ' + http_port);
+        console.log(`HTTP Server started on port ${http_port} and the process id is ${process.pid}`);
     }
     /**
      * Handle the request from the client.

src/service/aggregator/NotificationStreamProcessor.ts

@@ -1,8 +1,10 @@
 import { turtleStringToStore } from "@treecg/ldes-snapshot";
+import { DataFactory } from 'rdf-data-factory';
 import { LDESinLDP, LDPCommunication } from "@treecg/versionawareldesinldp";
 import { RDFStream, RSPEngine } from "rsp-js";
 import { TREE } from "@treecg/versionawareldesinldp";
 import { create_subscription, extract_ldp_inbox, extract_subscription_server } from "../../utils/notifications/Util";
+const DF = new DataFactory();
 
 /**
  * The NotificationStreamProcessor class is responsible for processing the notifications from the LDES Stream.
@@ -96,7 +98,7 @@ export class NotificationStreamProcessor {
              * of the Solid Stream Aggregator (for now, and the support for this will be implemented in the future).
              */
             const latest_event_store = await turtleStringToStore(latest_event);
-            const timestamp = latest_event_store.getQuads(null, bucket_strategy, null, null)[0].object.value;
+            const timestamp = latest_event_store.getQuads(null, DF.namedNode(bucket_strategy), null, null)[0].object.value;
             const timestamp_epoch = Date.parse(timestamp);
             if (this.stream_name) {
                 this.logger.info({}, 'latest_event_received_preprocessing_completed_adding_to_rsp_engine_started');

src/service/publishing-stream-to-pod/LDESPublisher.ts

@@ -17,6 +17,7 @@ import { Logger, ILogObj } from "tslog";
 const ld_fetch = require('ldfetch');
 const ldfetch = new ld_fetch({});
 import { EndpointQueries } from "../../server/EndpointQueries";
+import { getSession } from "css-auth-login";
 /**
  * Class for publishing the resources (which were generated by the RSP Engine) to the LDES in the LDP container 
  * of the aggregation pod.
@@ -38,7 +39,11 @@ export class LDESPublisher {
      * @memberof LDESPublisher
      */
     constructor() {
-        this.initialise();
+        /*
+        The initialise() method initializes a LDES in LDP container 
+
+        this.initialise(); // Initialises the LDES in the LDP container of the aggregation pod.
+        */
         this.config = {
             treePath: this.treePath, versionOfPath: "1.0"
         }

src/utils/logger/Logger.test.ts

@@ -0,0 +1,24 @@
+import { Logger, LogLevel } from "./Logger";
+
+describe('Logger', () => {
+    it('should initialize', () => {
+        const logLevel: LogLevel = LogLevel.INFO;
+        const loggableClasses = ['RSPService'];
+        const logDestination_console = 'CONSOLE';
+        const logDestination_file = 'FILE';
+        const logger_console = new Logger(
+            logLevel,
+            loggableClasses,
+            logDestination_console,
+        );
+        expect(logger_console).toBeDefined();
+
+        const logger_file = new Logger(
+            logLevel,
+            loggableClasses,
+            logDestination_file,
+        );
+
+        expect(logger_file).toBeDefined();
+    });
+});