refactoring

2025-12-10 07:48:37 +01:00 · 2025-01-25 15:31:37 +01:00
parent e4bdf7e4c3
commit 3960eaa8ad
11 changed files with 833 additions and 2221 deletions
--- a/consumer/pnpm-lock.yaml
+++ b/consumer/pnpm-lock.yaml
--- a/package.json
+++ b/package.json
@@ -4,7 +4,9 @@
  "description": "",
  "main": "index.js",
  "scripts": {
-    "dashboard:clear-logs": "node scripts/dashboard/clear-logs.js"
+    "dashboard:clear-logs": "node scripts/dashboard/clear-logs.js",
+    "dashboard:shared": "node scripts/dashboard/shared.js",
+    "producer:shared": "node scripts/producer/shared.js"
  },
  "keywords": [],
  "author": "Emily",
--- a/producer/ecosystem.config.example.cjs
+++ b/producer/ecosystem.config.example.cjs
@@ -1,18 +0,0 @@
-module.exports = {
-    apps: [
-        {
-            name: 'producer',
-            port: '3000',
-            exec_mode: 'cluster',
-            instances: '1',
-            script: './dist/broker/src/index.js',
-            env: {
-                PORT: "",
-                REDIS_URL: "",
-                REDIS_USERNAME: "",
-                REDIS_PASSWORD: "",
-                STREAM_NAME: ""
-            }
-        }
-    ]
-}
--- a/producer/pnpm-lock.yaml
+++ b/producer/pnpm-lock.yaml
--- a/producer/tsconfig.json
+++ b/producer/tsconfig.json
@@ -1,9 +1,7 @@
 {
-    "extends": "../tsconfig.json",
    "compilerOptions": {
        "module": "NodeNext",
        "target": "ESNext",
-        "esModuleInterop": true,
        "outDir": "dist"
    },
    "include": [
--- a/scripts/dashboard/shared.js
+++ b/scripts/dashboard/shared.js
@@ -1,63 +1,68 @@
 const path = require('path');
 const fs = require('fs');
+const { SharedHelper } = require('../shared-helper.js');

-const dashboardPath = path.join(__dirname, '../../dashboard');
-const sharedPath = path.join(__dirname, '../../shared_global');
+
+const helper = new SharedHelper(path.join(__dirname, '../../dashboard'))
+
+helper.clear();

 // TODO: Email service as external repo


-
-// ---------------- Services ----------------
-const dashServicesPath = path.join(dashboardPath, 'shared/services');
-const sharedServicesPath = path.join(sharedPath, 'services');
-
-if (fs.existsSync(dashServicesPath)) {
-    fs.rmSync(dashServicesPath, { force: true, recursive: true });
-    fs.mkdirSync(dashServicesPath);
-}
-
-// DateService
-const dashDateServicePath = path.join(dashServicesPath, 'DateService.ts');
-const sharedDateServicePath = path.join(sharedServicesPath, 'DateService.ts');
-fs.cpSync(sharedDateServicePath, dashDateServicePath);
+// helper.create('/shared/services');


-// ---------------- Data ----------------
+// // ---------------- Services ----------------
+// const dashServicesPath = path.join(dashboardPath, 'shared/services');
+// const sharedServicesPath = path.join(sharedPath, 'services');

-const dashDataPath = path.join(dashboardPath, 'shared/data');
-const sharedDataPath = path.join(sharedPath, 'data');
+// if (fs.existsSync(dashServicesPath)) {
+//     fs.rmSync(dashServicesPath, { force: true, recursive: true });
+//     fs.mkdirSync(dashServicesPath);
+// }

-if (fs.existsSync(dashDataPath)) {
-    fs.rmSync(dashDataPath, { force: true, recursive: true });
-    fs.mkdirSync(dashDataPath);
-}
+// // DateService
+// const dashDateServicePath = path.join(dashServicesPath, 'DateService.ts');
+// const sharedDateServicePath = path.join(sharedServicesPath, 'DateService.ts');
+// fs.cpSync(sharedDateServicePath, dashDateServicePath);

-// Premium
-const dashPremiumDataPath = path.join(dashDataPath, 'PREMIUM.ts');
-const sharedPremiumDataPath = path.join(sharedDataPath, 'PREMIUM.ts');
-fs.cpSync(sharedPremiumDataPath, dashPremiumDataPath);

-// Admins
-const dashAdminsDataPath = path.join(dashDataPath, 'ADMINS.ts');
-const sharedAdminsDataPath = path.join(sharedDataPath, 'ADMINS.ts');
-fs.cpSync(sharedAdminsDataPath, dashAdminsDataPath);
+// // ---------------- Data ----------------

-// BrokerLimits
-const dashBrokerLimitsDataPath = path.join(dashDataPath, 'broker/Limits.ts');
-const sharedBrokerLimitsDataPath = path.join(sharedDataPath, 'broker/Limits.ts');
-fs.cpSync(sharedBrokerLimitsDataPath, dashBrokerLimitsDataPath);
+// const dashDataPath = path.join(dashboardPath, 'shared/data');
+// const sharedDataPath = path.join(sharedPath, 'data');
+
+// if (fs.existsSync(dashDataPath)) {
+//     fs.rmSync(dashDataPath, { force: true, recursive: true });
+//     fs.mkdirSync(dashDataPath);
+// }
+
+// // Premium
+// const dashPremiumDataPath = path.join(dashDataPath, 'PREMIUM.ts');
+// const sharedPremiumDataPath = path.join(sharedDataPath, 'PREMIUM.ts');
+// fs.cpSync(sharedPremiumDataPath, dashPremiumDataPath);
+
+// // Admins
+// const dashAdminsDataPath = path.join(dashDataPath, 'ADMINS.ts');
+// const sharedAdminsDataPath = path.join(sharedDataPath, 'ADMINS.ts');
+// fs.cpSync(sharedAdminsDataPath, dashAdminsDataPath);
+
+// // BrokerLimits
+// const dashBrokerLimitsDataPath = path.join(dashDataPath, 'broker/Limits.ts');
+// const sharedBrokerLimitsDataPath = path.join(sharedDataPath, 'broker/Limits.ts');
+// fs.cpSync(sharedBrokerLimitsDataPath, dashBrokerLimitsDataPath);



-// ---------------- Schema ----------------
+// // ---------------- Schema ----------------

-const dashSchemaPath = path.join(dashboardPath, 'shared/schema');
-const sharedSchemaPath = path.join(sharedPath, 'schema');
+// const dashSchemaPath = path.join(dashboardPath, 'shared/schema');
+// const sharedSchemaPath = path.join(sharedPath, 'schema');

-if (fs.existsSync(dashSchemaPath)) {
-    fs.rmSync(dashSchemaPath, { force: true, recursive: true });
-    fs.mkdirSync(dashSchemaPath);
-}
+// if (fs.existsSync(dashSchemaPath)) {
+//     fs.rmSync(dashSchemaPath, { force: true, recursive: true });
+//     fs.mkdirSync(dashSchemaPath);
+// }

-fs.cpSync(sharedSchemaPath, dashSchemaPath, { recursive: true });
+// fs.cpSync(sharedSchemaPath, dashSchemaPath, { recursive: true });
--- a/scripts/producer/shared.js
+++ b/scripts/producer/shared.js
@@ -0,0 +1,6 @@
+const { getSharedPath } = require("../shared-helper");
+
+
+
+console.log('SHAREDPATH')
+console.log(getSharedPath());
--- a/scripts/shared-helper.js
+++ b/scripts/shared-helper.js
@@ -0,0 +1,40 @@
+
+const path = require('path');
+const fs = require('fs');
+
+
+class SharedHelper {
+
+    static getSharedPath() {
+        return path.join(__dirname, '../shared_global');
+    }
+
+    constructor(localSharedPath) {
+        this.localSharedPath = localSharedPath;
+    }
+
+    clear() {
+        if (fs.existsSync(this.localSharedPath)) {
+            fs.rmSync(this.localSharedPath, { force: true, recursive: true });
+            fs.mkdirSync(this.localSharedPath);
+        }
+    }
+
+    create(name) {
+        const localFolder = path.join(this.localSharedPath, name);
+        fs.mkdirSync(localFolder);
+    }
+
+    copy(name) {
+        const localSharedFile = path.join(this.localSharedPath, name);
+        fs.cpSync(SharedHelper.getSharedPath(), localSharedFile);
+    }
+
+}
+
+
+
+
+module.exports = {
+    SharedHelper
+}
--- a/shared_global/package.json
+++ b/shared_global/package.json
@@ -3,5 +3,12 @@
 	"version": "1.0.0",
 	"author": "Emily",
 	"license": "MIT",
-	"description": ""
+	"description": "",
+	"devDependencies": {
+		"@types/node": "^22.10.10",
+		"date-fns": "^4.1.0",
+		"dayjs": "^1.11.13",
+		"mongoose": "^8.9.5",
+		"redis": "^4.7.0"
+	}
 }
--- a/shared_global/pnpm-lock.yaml
+++ b/shared_global/pnpm-lock.yaml
@@ -0,0 +1,310 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    devDependencies:
+      '@types/node':
+        specifier: ^22.10.10
+        version: 22.10.10
+      date-fns:
+        specifier: ^4.1.0
+        version: 4.1.0
+      dayjs:
+        specifier: ^1.11.13
+        version: 1.11.13
+      mongoose:
+        specifier: ^8.9.5
+        version: 8.9.5
+      redis:
+        specifier: ^4.7.0
+        version: 4.7.0
+
+packages:
+
+  '@mongodb-js/saslprep@1.1.9':
+    resolution: {integrity: sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==}
+
+  '@redis/bloom@1.2.0':
+    resolution: {integrity: sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+
+  '@redis/client@1.6.0':
+    resolution: {integrity: sha512-aR0uffYI700OEEH4gYnitAnv3vzVGXCFvYfdpu/CJKvk4pHfLPEy/JSZyrpQ+15WhXe1yJRXLtfQ84s4mEXnPg==}
+    engines: {node: '>=14'}
+
+  '@redis/graph@1.1.1':
+    resolution: {integrity: sha512-FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+
+  '@redis/json@1.0.7':
+    resolution: {integrity: sha512-6UyXfjVaTBTJtKNG4/9Z8PSpKE6XgSyEb8iwaqDcy+uKrd/DGYHTWkUdnQDyzm727V7p21WUMhsqz5oy65kPcQ==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+
+  '@redis/search@1.2.0':
+    resolution: {integrity: sha512-tYoDBbtqOVigEDMAcTGsRlMycIIjwMCgD8eR2t0NANeQmgK/lvxNAvYyb6bZDD4frHRhIHkJu2TBRvB0ERkOmw==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+
+  '@redis/time-series@1.1.0':
+    resolution: {integrity: sha512-c1Q99M5ljsIuc4YdaCwfUEXsofakb9c8+Zse2qxTadu8TalLXuAESzLvFAvNVbkmSlvlzIQOLpBCmWI9wTOt+g==}
+    peerDependencies:
+      '@redis/client': ^1.0.0
+
+  '@types/node@22.10.10':
+    resolution: {integrity: sha512-X47y/mPNzxviAGY5TcYPtYL8JsY3kAq2n8fMmKoRCxq/c4v4pyGNCzM2R6+M5/umG4ZfHuT+sgqDYqWc9rJ6ww==}
+
+  '@types/webidl-conversions@7.0.3':
+    resolution: {integrity: sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==}
+
+  '@types/whatwg-url@11.0.5':
+    resolution: {integrity: sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==}
+
+  bson@6.10.1:
+    resolution: {integrity: sha512-P92xmHDQjSKPLHqFxefqMxASNq/aWJMEZugpCjf+AF/pgcUpMMQCg7t7+ewko0/u8AapvF3luf/FoehddEK+sA==}
+    engines: {node: '>=16.20.1'}
+
+  cluster-key-slot@1.1.2:
+    resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
+    engines: {node: '>=0.10.0'}
+
+  date-fns@4.1.0:
+    resolution: {integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==}
+
+  dayjs@1.11.13:
+    resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}
+
+  debug@4.4.0:
+    resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  generic-pool@3.9.0:
+    resolution: {integrity: sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==}
+    engines: {node: '>= 4'}
+
+  kareem@2.6.3:
+    resolution: {integrity: sha512-C3iHfuGUXK2u8/ipq9LfjFfXFxAZMQJJq7vLS45r3D9Y2xQ/m4S8zaR4zMLFWh9AsNPXmcFfUDhTEO8UIC/V6Q==}
+    engines: {node: '>=12.0.0'}
+
+  memory-pager@1.5.0:
+    resolution: {integrity: sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==}
+
+  mongodb-connection-string-url@3.0.2:
+    resolution: {integrity: sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==}
+
+  mongodb@6.12.0:
+    resolution: {integrity: sha512-RM7AHlvYfS7jv7+BXund/kR64DryVI+cHbVAy9P61fnb1RcWZqOW1/Wj2YhqMCx+MuYhqTRGv7AwHBzmsCKBfA==}
+    engines: {node: '>=16.20.1'}
+    peerDependencies:
+      '@aws-sdk/credential-providers': ^3.188.0
+      '@mongodb-js/zstd': ^1.1.0 || ^2.0.0
+      gcp-metadata: ^5.2.0
+      kerberos: ^2.0.1
+      mongodb-client-encryption: '>=6.0.0 <7'
+      snappy: ^7.2.2
+      socks: ^2.7.1
+    peerDependenciesMeta:
+      '@aws-sdk/credential-providers':
+        optional: true
+      '@mongodb-js/zstd':
+        optional: true
+      gcp-metadata:
+        optional: true
+      kerberos:
+        optional: true
+      mongodb-client-encryption:
+        optional: true
+      snappy:
+        optional: true
+      socks:
+        optional: true
+
+  mongoose@8.9.5:
+    resolution: {integrity: sha512-SPhOrgBm0nKV3b+IIHGqpUTOmgVL5Z3OO9AwkFEmvOZznXTvplbomstCnPOGAyungtRXE5pJTgKpKcZTdjeESg==}
+    engines: {node: '>=16.20.1'}
+
+  mpath@0.9.0:
+    resolution: {integrity: sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==}
+    engines: {node: '>=4.0.0'}
+
+  mquery@5.0.0:
+    resolution: {integrity: sha512-iQMncpmEK8R8ncT8HJGsGc9Dsp8xcgYMVSbs5jgnm1lFHTZqMJTUWTDx1LBO8+mK3tPNZWFLBghQEIOULSTHZg==}
+    engines: {node: '>=14.0.0'}
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
+
+  redis@4.7.0:
+    resolution: {integrity: sha512-zvmkHEAdGMn+hMRXuMBtu4Vo5P6rHQjLoHftu+lBqq8ZTA3RCVC/WzD790bkKKiNFp7d5/9PcSD19fJyyRvOdQ==}
+
+  sift@17.1.3:
+    resolution: {integrity: sha512-Rtlj66/b0ICeFzYTuNvX/EF1igRbbnGSvEyT79McoZa/DeGhMyC5pWKOEsZKnpkqtSeovd5FL/bjHWC3CIIvCQ==}
+
+  sparse-bitfield@3.0.3:
+    resolution: {integrity: sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==}
+
+  tr46@5.0.0:
+    resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==}
+    engines: {node: '>=18'}
+
+  undici-types@6.20.0:
+    resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==}
+
+  webidl-conversions@7.0.0:
+    resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
+    engines: {node: '>=12'}
+
+  whatwg-url@14.1.0:
+    resolution: {integrity: sha512-jlf/foYIKywAt3x/XWKZ/3rz8OSJPiWktjmk891alJUEjiVxKX9LEO92qH3hv4aJ0mN3MWPvGMCy8jQi95xK4w==}
+    engines: {node: '>=18'}
+
+  yallist@4.0.0:
+    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
+
+snapshots:
+
+  '@mongodb-js/saslprep@1.1.9':
+    dependencies:
+      sparse-bitfield: 3.0.3
+
+  '@redis/bloom@1.2.0(@redis/client@1.6.0)':
+    dependencies:
+      '@redis/client': 1.6.0
+
+  '@redis/client@1.6.0':
+    dependencies:
+      cluster-key-slot: 1.1.2
+      generic-pool: 3.9.0
+      yallist: 4.0.0
+
+  '@redis/graph@1.1.1(@redis/client@1.6.0)':
+    dependencies:
+      '@redis/client': 1.6.0
+
+  '@redis/json@1.0.7(@redis/client@1.6.0)':
+    dependencies:
+      '@redis/client': 1.6.0
+
+  '@redis/search@1.2.0(@redis/client@1.6.0)':
+    dependencies:
+      '@redis/client': 1.6.0
+
+  '@redis/time-series@1.1.0(@redis/client@1.6.0)':
+    dependencies:
+      '@redis/client': 1.6.0
+
+  '@types/node@22.10.10':
+    dependencies:
+      undici-types: 6.20.0
+
+  '@types/webidl-conversions@7.0.3': {}
+
+  '@types/whatwg-url@11.0.5':
+    dependencies:
+      '@types/webidl-conversions': 7.0.3
+
+  bson@6.10.1: {}
+
+  cluster-key-slot@1.1.2: {}
+
+  date-fns@4.1.0: {}
+
+  dayjs@1.11.13: {}
+
+  debug@4.4.0:
+    dependencies:
+      ms: 2.1.3
+
+  generic-pool@3.9.0: {}
+
+  kareem@2.6.3: {}
+
+  memory-pager@1.5.0: {}
+
+  mongodb-connection-string-url@3.0.2:
+    dependencies:
+      '@types/whatwg-url': 11.0.5
+      whatwg-url: 14.1.0
+
+  mongodb@6.12.0:
+    dependencies:
+      '@mongodb-js/saslprep': 1.1.9
+      bson: 6.10.1
+      mongodb-connection-string-url: 3.0.2
+
+  mongoose@8.9.5:
+    dependencies:
+      bson: 6.10.1
+      kareem: 2.6.3
+      mongodb: 6.12.0
+      mpath: 0.9.0
+      mquery: 5.0.0
+      ms: 2.1.3
+      sift: 17.1.3
+    transitivePeerDependencies:
+      - '@aws-sdk/credential-providers'
+      - '@mongodb-js/zstd'
+      - gcp-metadata
+      - kerberos
+      - mongodb-client-encryption
+      - snappy
+      - socks
+      - supports-color
+
+  mpath@0.9.0: {}
+
+  mquery@5.0.0:
+    dependencies:
+      debug: 4.4.0
+    transitivePeerDependencies:
+      - supports-color
+
+  ms@2.1.3: {}
+
+  punycode@2.3.1: {}
+
+  redis@4.7.0:
+    dependencies:
+      '@redis/bloom': 1.2.0(@redis/client@1.6.0)
+      '@redis/client': 1.6.0
+      '@redis/graph': 1.1.1(@redis/client@1.6.0)
+      '@redis/json': 1.0.7(@redis/client@1.6.0)
+      '@redis/search': 1.2.0(@redis/client@1.6.0)
+      '@redis/time-series': 1.1.0(@redis/client@1.6.0)
+
+  sift@17.1.3: {}
+
+  sparse-bitfield@3.0.3:
+    dependencies:
+      memory-pager: 1.5.0
+
+  tr46@5.0.0:
+    dependencies:
+      punycode: 2.3.1
+
+  undici-types@6.20.0: {}
+
+  webidl-conversions@7.0.0: {}
+
+  whatwg-url@14.1.0:
+    dependencies:
+      tr46: 5.0.0
+      webidl-conversions: 7.0.0
+
+  yallist@4.0.0: {}
--- a/shared_global/schema/metrics/VisitSchema.ts
+++ b/shared_global/schema/metrics/VisitSchema.ts
@@ -29,7 +29,7 @@ const VisitSchema = new Schema<TVisit>({
    continent: { type: String },
    country: { type: String },

-    session: { type: String },
+    session: { type: String, index: true },
    flowHash: { type: String },
    device: { type: String },