5.0.26

.gitea/workflows/gitzone_ci_default.yaml

@@ -1,107 +0,0 @@
-name: CI Pipeline
-
-on: push
-
-env:
-  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-jobs:
-
-  security:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    container:
-      image: ${{ env.IMAGE }}
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install pnpm and npmci
-      run: |
-        pnpm install -g pnpm
-        pnpm install -g @shipzone/npmci
-
-    - name: Run npm prepare
-      run: npmci npm prepare
-
-    - name: Audit production dependencies
-      run: |
-        npmci command npm config set registry https://registry.npmjs.org
-        npmci command pnpm audit --audit-level=high --prod
-      continue-on-error: true
-
-    - name: Audit development dependencies
-      run: |
-        npmci command npm config set registry https://registry.npmjs.org
-        npmci command pnpm audit --audit-level=high --dev
-      continue-on-error: true
-
-  test:
-    if: ${{ always() }}
-    needs: security
-    runs-on: ubuntu-latest
-    container:
-      image: ${{ env.IMAGE }}
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Test stable
-      run: |
-        npmci node install stable
-        npmci npm install
-        npmci npm test
-
-    - name: Test build
-      run: |
-        npmci node install stable
-        npmci npm install
-        npmci npm build
-
-  release:
-    needs: test
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    container:
-      image: ${{ env.IMAGE }}
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Release
-      run: |
-        npmci node install stable
-        npmci npm publish
-
-  metadata:
-    needs: test
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    container:
-      image: ${{ env.IMAGE }}
-    continue-on-error: true
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Code quality
-      run: |
-        npmci command npm install -g typescript
-        npmci npm prepare
-        npmci npm install
-
-    - name: Trigger
-      run: npmci trigger
-
-    - name: Build docs and upload artifacts
-      run: |
-        npmci node install stable
-        npmci npm install
-        npmci command npm run buildDocs
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: public
-        path: public
-        retention-days: 7

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartdata",
-  "version": "5.0.22",
+  "version": "5.0.26",
   "private": false,
   "description": "do more with data",
   "main": "dist_ts/index.js",
@@ -25,13 +25,13 @@
     "@push.rocks/lik": "^6.0.2",
     "@push.rocks/smartdelay": "^3.0.1",
     "@push.rocks/smartlog": "^3.0.2",
-    "@push.rocks/smartmongo": "^2.0.7",
+    "@push.rocks/smartmongo": "^2.0.10",
     "@push.rocks/smartpromise": "^4.0.2",
-    "@push.rocks/smartrx": "^3.0.2",
+    "@push.rocks/smartrx": "^3.0.6",
     "@push.rocks/smartstring": "^4.0.7",
     "@push.rocks/smarttime": "^4.0.1",
     "@push.rocks/smartunique": "^3.0.3",
-    "@push.rocks/taskbuffer": "^3.0.10",
+    "@push.rocks/taskbuffer": "^3.1.2",
     "@tsclass/tsclass": "^4.0.42",
     "mongodb": "^5.7.0"
   },
@@ -39,9 +39,9 @@
     "@gitzone/tsbuild": "^2.1.66",
     "@gitzone/tsrun": "^1.2.44",
     "@gitzone/tstest": "^1.0.77",
-    "@push.rocks/qenv": "^5.0.2",
-    "@push.rocks/tapbundle": "^5.0.8",
-    "@types/node": "^20.4.2",
+    "@push.rocks/qenv": "^6.0.2",
+    "@push.rocks/tapbundle": "^5.0.15",
+    "@types/node": "^20.4.10",
     "@types/shortid": "0.0.29"
   },
   "files": [

test/test.distributedcoordinator.ts

@@ -0,0 +1,104 @@
+import { tap, expect } from '@push.rocks/tapbundle';
+import * as smartmongo from '@push.rocks/smartmongo';
+import type * as taskbuffer from '@push.rocks/taskbuffer';
+
+import * as smartdata from '../ts/index.js';
+import { SmartdataDistributedCoordinator, DistributedClass } from '../ts/smartdata.classes.distributedcoordinator.js'; // path might need adjusting
+const totalInstances = 10;
+
+// =======================================
+// Connecting to the database server
+// =======================================
+
+let smartmongoInstance: smartmongo.SmartMongo;
+let testDb: smartdata.SmartdataDb;
+
+tap.test('should create a testinstance as database', async () => {
+  smartmongoInstance = await smartmongo.SmartMongo.createAndStart();
+  testDb = new smartdata.SmartdataDb(await smartmongoInstance.getMongoDescriptor());
+  await testDb.init();
+});
+
+tap.test('should instantiate DistributedClass', async (tools) => {
+    const instance = new DistributedClass();
+    expect(instance).toBeInstanceOf(DistributedClass);
+});
+
+tap.test('DistributedClass should update the time', async (tools) => {
+    const distributedCoordinator = new SmartdataDistributedCoordinator(testDb);
+    await distributedCoordinator.start();
+    console.log('test: started');
+    const initialTime = distributedCoordinator.ownInstance.data.lastUpdated;
+    await distributedCoordinator.sendHeartbeat();
+    console.log('test: sent heartbeat');
+    const updatedTime = distributedCoordinator.ownInstance.data.lastUpdated;
+    expect(updatedTime).toBeGreaterThan(initialTime);
+    await distributedCoordinator.stop();
+});
+
+tap.test('should instantiate SmartdataDistributedCoordinator', async (tools) => {
+    const coordinator = new SmartdataDistributedCoordinator(testDb);
+    await coordinator.start();
+    expect(coordinator).toBeInstanceOf(SmartdataDistributedCoordinator);
+    await coordinator.stop();
+});
+
+tap.test('SmartdataDistributedCoordinator should update leader status', async (tools) => {
+    const coordinator = new SmartdataDistributedCoordinator(testDb);
+    await coordinator.start();
+    await coordinator.checkAndMaybeLead();
+    expect(coordinator.ownInstance.data.elected).toBeOneOf([true, false]);
+    await coordinator.stop();
+    process.exit(0);
+});
+
+tap.test('SmartdataDistributedCoordinator should handle distributed task requests', async (tools) => {
+    const coordinator = new SmartdataDistributedCoordinator(testDb);
+    await coordinator.start();
+
+    const mockTaskRequest: taskbuffer.distributedCoordination.IDistributedTaskRequest = {
+        submitterId: "mockSubmitter12345",    // Some unique mock submitter ID
+        taskName: "SampleTask",
+        taskVersion: "1.0.0",                  // Assuming it's a version string
+        taskExecutionTime: Date.now(),
+        taskExecutionTimeout: 60000,           // Let's say the timeout is 1 minute (60000 ms)
+        taskExecutionParallel: 5,              // Let's assume max 5 parallel executions
+        status: 'requesting'
+    };
+
+    const response = await coordinator.fireDistributedTaskRequest(mockTaskRequest);
+    expect(response).toBeTruthy();  // based on your expected structure for the response
+    await coordinator.stop();
+});
+
+tap.test('SmartdataDistributedCoordinator should update distributed task requests', async (tools) => {
+    const coordinator = new SmartdataDistributedCoordinator(testDb);
+    
+    await coordinator.start();
+
+    const mockTaskRequest: taskbuffer.distributedCoordination.IDistributedTaskRequest = {
+        submitterId: "mockSubmitter12345",    // Some unique mock submitter ID
+        taskName: "SampleTask",
+        taskVersion: "1.0.0",                  // Assuming it's a version string
+        taskExecutionTime: Date.now(),
+        taskExecutionTimeout: 60000,           // Let's say the timeout is 1 minute (60000 ms)
+        taskExecutionParallel: 5,              // Let's assume max 5 parallel executions
+        status: 'requesting'
+    };
+    
+
+    await coordinator.updateDistributedTaskRequest(mockTaskRequest);
+    // Here, we can potentially check if a DB entry got updated or some other side-effect of the update method.
+});
+
+tap.test('should elect only one leader amongst multiple instances', async (tools) => {
+    const coordinators = Array.from({ length: totalInstances }).map(() => new SmartdataDistributedCoordinator(testDb));
+    await Promise.all(coordinators.map(coordinator => coordinator.init()));
+
+    await Promise.all(coordinators.map(coordinator => coordinator.checkAndMaybeLead()));
+
+    const leaders = coordinators.filter(coordinator => coordinator.ownInstance.data.elected);
+    expect(leaders.length).toEqual(1);
+});
+
+tap.start({ throwOnError: true });

test/test.ts

@@ -30,7 +30,7 @@ tap.test('should create a testinstance as database', async () => {
 tap.skip.test('should connect to atlas', async (tools) => {
   const databaseName = `test-smartdata-${smartunique.shortId()}`;
   testDb = new smartdata.SmartdataDb({
-    mongoDbUrl: testQenv.getEnvVarOnDemand('MONGO_URL'),
+    mongoDbUrl: await testQenv.getEnvVarOnDemand('MONGO_URL'),
     mongoDbName: databaseName,
   });
   await testDb.init();

test/test.typescript.ts

@@ -28,7 +28,7 @@ tap.test('should create a testinstance as database', async () => {
 tap.skip.test('should connect to atlas', async (tools) => {
   const databaseName = `test-smartdata-${smartunique.shortId()}`;
   testDb = new smartdata.SmartdataDb({
-    mongoDbUrl: testQenv.getEnvVarOnDemand('MONGO_URL'),
+    mongoDbUrl: await testQenv.getEnvVarOnDemand('MONGO_URL'),
     mongoDbName: databaseName,
   });
   await testDb.init();

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/smartdata',
-  version: '5.0.22',
+  version: '5.0.26',
   description: 'do more with data'
 }

ts/smartdata.classes.distributedcoordinator.ts

@@ -4,7 +4,7 @@ import { Manager, setDefaultManagerForDoc } from './smartdata.classes.collection
 import { SmartDataDbDoc, svDb, unI } from './smartdata.classes.doc.js';
 
 @Manager()
-class DistributedClass extends SmartDataDbDoc<DistributedClass, DistributedClass> {
+export class DistributedClass extends SmartDataDbDoc<DistributedClass, DistributedClass> {
   // INSTANCE
   @unI()
   public id: string;
@@ -37,14 +37,13 @@ export class SmartdataDistributedCoordinator extends plugins.taskbuffer.distribu
   public readyPromise: Promise<any>;
   public db: SmartdataDb;
   private asyncExecutionStack = new plugins.lik.AsyncExecutionStack();
-  private ownInstance: DistributedClass;
+  public ownInstance: DistributedClass;
 
-  constructor(dbArg?: SmartdataDb) {
+  constructor(dbArg: SmartdataDb) {
     super();
     this.db = dbArg;
     setDefaultManagerForDoc(this, DistributedClass);
     this.readyPromise = this.db.statusConnectedDeferred.promise;
-    this.init();
   }
 
   // smartdata specific stuff
@@ -64,15 +63,19 @@ export class SmartdataDistributedCoordinator extends plugins.taskbuffer.distribu
 
   private startHeartbeat = async () => {
     while (this.ownInstance.data.status !== 'stopped') {
-      await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
-        await this.ownInstance.updateFromDb();
-        this.ownInstance.data.lastUpdated = Date.now();
-        await this.ownInstance.save();
-      });
+      await this.sendHeartbeat();
       await plugins.smartdelay.delayFor(10000);
     }
   };
-  public async init() {
+
+  public async sendHeartbeat() {
+    await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
+      await this.ownInstance.updateFromDb();
+      this.ownInstance.data.lastUpdated = Date.now();
+      await this.ownInstance.save();
+    });
+  }
+  private async init() {
     await this.readyPromise;
     if (!this.ownInstance) {
       await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {