6.0.6

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+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

.gitea/workflows/default_tags.yaml

@@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          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: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - 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: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - 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: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @git.zone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true

.gitlab-ci.yml

@@ -1,128 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-    - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
-
-stages:
-  - security
-  - test
-  - release
-  - metadata
-
-before_script:
-  - pnpm install -g pnpm
-  - pnpm install -g @shipzone/npmci
-  - npmci npm prepare
-
-# ====================
-# security stage
-# ====================
-# ====================
-# security stage
-# ====================
-auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-     - npmci command npm config set registry https://registry.npmjs.org
-     - npmci command pnpm audit --audit-level=high --prod
-  tags:
-    - lossless
-    - docker
-  allow_failure: true
-
-auditDevDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  stage: security
-  script:
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command pnpm audit --audit-level=high --dev
-  tags:
-    - lossless
-    - docker
-  allow_failure: true
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-testBuild:
-  stage: test
-  script:
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  only:
-    - tags
-  script:
-    - npmci command npm install -g typescript
-    - npmci npm prepare
-    - npmci npm install
-  tags:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  stage: metadata
-  script:
-    - npmci node install stable
-    - npmci npm install
-    - npmci command npm run buildDocs
-  tags:
-    - lossless
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

.vscode/launch.json

@@ -2,8 +2,8 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "command": "# instrumented",
-      "name": "Run instrumented terminal",
+      "command": "npm test",
+      "name": "Run npm test",
       "request": "launch",
       "type": "node-terminal"
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/lik",
-  "version": "6.0.3",
+  "version": "6.0.6",
   "private": false,
   "description": "light little helpers for node",
   "main": "dist_ts/index.js",
@@ -22,21 +22,21 @@
   },
   "homepage": "https://gitlab.com/pushrocks/lik#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.63",
-    "@gitzone/tsbundle": "^2.0.4",
-    "@gitzone/tsrun": "^1.2.39",
-    "@gitzone/tstest": "^1.0.71",
-    "@pushrocks/tapbundle": "^5.0.3",
-    "@types/node": "^18.11.18"
+    "@git.zone/tsbuild": "^2.1.66",
+    "@git.zone/tsbundle": "^2.0.8",
+    "@git.zone/tsrun": "^1.2.44",
+    "@git.zone/tstest": "^1.0.77",
+    "@pushrocks/tapbundle": "^5.0.8",
+    "@types/node": "^20.9.0"
   },
   "dependencies": {
-    "@push.rocks/smartdelay": "^3.0.2",
+    "@push.rocks/smartdelay": "^3.0.5",
     "@push.rocks/smartmatch": "^2.0.0",
     "@push.rocks/smartpromise": "^4.0.3",
-    "@push.rocks/smartrx": "^3.0.0",
-    "@push.rocks/smarttime": "^4.0.1",
+    "@push.rocks/smartrx": "^3.0.7",
+    "@push.rocks/smarttime": "^4.0.6",
     "@types/minimatch": "^5.1.2",
-    "@types/symbol-tree": "^3.2.2",
+    "@types/symbol-tree": "^3.2.5",
     "symbol-tree": "^3.2.4"
   },
   "files": [

readme.md

@@ -1,26 +1,26 @@
-# @pushrocks/lik
+# @push.rocks/lik
 light little helpers for node
 
 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/lik)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/lik)
-* [github.com (source mirror)](https://github.com/pushrocks/lik)
-* [docs (typedoc)](https://pushrocks.gitlab.io/lik/)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/lik)
+* [gitlab.com (source)](https://gitlab.com/push.rocks/lik)
+* [github.com (source mirror)](https://github.com/push.rocks/lik)
+* [docs (typedoc)](https://push.rocks.gitlab.io/lik/)
 
 ## Status for master
 
 Status Category | Status Badge
 -- | --
-GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/lik/badges/master/pipeline.svg)](https://lossless.cloud)
-GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/lik/badges/master/coverage.svg)](https://lossless.cloud)
-npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/lik)](https://lossless.cloud)
-Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/lik)](https://lossless.cloud)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/push.rocks/lik/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/push.rocks/lik/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/lik)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/push.rocks/lik)](https://lossless.cloud)
 TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
 node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
 Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
-PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/lik)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/lik)](https://lossless.cloud)
-BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/lik)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@push.rocks/lik)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/lik)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/lik)](https://lossless.cloud)
 
 ## Usage
 

test/test.asyncexecutionstack.both.ts

@@ -26,4 +26,4 @@ tap.test('should run in parallel', async (toolsArg) => {
   }, 0);
 });
 
-tap.start();
+await tap.start();

test/test.fastmap.both.ts

@@ -27,4 +27,4 @@ tap.test('should find an entry', async () => {
   expect(result.value1).toEqual('heyho3');
 });
 
-tap.start();
+await tap.start();

test/test.interestmap.both.ts

@@ -22,4 +22,4 @@ tap.test('should be able to inform about a lost interest', async () => {
   testInterestmap.informLostInterest(3);
 });
 
-tap.start();
+await tap.start();

test/test.limitedarray.both.ts

@@ -14,4 +14,4 @@ tap.test('should never be longer than the set length', async () => {
   expect(testLimitedArray.array.length < 7).toBeTrue();
 });
 
-tap.start();
+await tap.start();

test/test.looptracker.both.ts

@@ -21,4 +21,4 @@ tap.test('should add objects once and return true', async () => {
   expect(myLoopTracker.checkAndTrack(object2)).toBeFalse();
 });
 
-tap.start();
+await tap.start();

test/test.objectmap.both.ts

@@ -73,4 +73,4 @@ tap.test('should get one object and then remove it', async () => {
   expect(testObjectmap.getArray()).not.toContain(oneObject);
 });
 
-tap.start();
+await tap.start();

test/test.stringmap.both.ts

@@ -83,4 +83,4 @@ tap.test('lik.Stringmap.empty() -> should remove wipe and then notify', async ()
   testStringmap.wipe();
 });
 
-tap.start();
+await tap.start();

test/test.timedaggregator.both.ts

@@ -20,4 +20,4 @@ tap.test('should create a timed aggregaotor', async (tools) => {
   await tools.delayFor(2000);
 });
 
-tap.start();
+await tap.start();

test/test.tree.both.ts

@@ -37,4 +37,4 @@ tap.test("should create a JSON object that reflects a tree's hierachy", async ()
   const jsonTreet = testTree.toJsonWithHierachy(testInstance);
 });
 
-tap.start();
+await tap.start();

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@push.rocks/lik',
-  version: '6.0.3',
+  version: '6.0.6',
   description: 'light little helpers for node'
 }

ts/lik.asyncexecutionstack.ts

@@ -7,12 +7,14 @@ interface IExecutionSlot<T> {
   mode: 'exclusive' | 'nonexclusive';
 }
 
-/**
- * allows for avoiding race condition
- */
 export class AsyncExecutionStack {
   private executionSlots: IExecutionSlot<any>[] = [];
-  public async getExclusiveExecutionSlot<T = any>(funcArg: () => Promise<T>, timeoutArg?: number) {
+  private isProcessing = false;
+
+  public async getExclusiveExecutionSlot<T = any>(
+    funcArg: () => Promise<T>,
+    timeoutArg?: number
+  ): Promise<T> {
     const executionDeferred = plugins.smartpromise.defer<T>();
     const executionSlot: IExecutionSlot<T> = {
       funcToExecute: funcArg,
@@ -24,10 +26,11 @@ export class AsyncExecutionStack {
     this.processExecutionSlots();
     return executionDeferred.promise;
   }
+
   public async getNonExclusiveExecutionSlot<T = any>(
     funcArg: () => Promise<T>,
     timeoutArg?: number
-  ) {
+  ): Promise<T> {
     const executionDeferred = plugins.smartpromise.defer<T>();
     const executionSlot: IExecutionSlot<T> = {
       funcToExecute: funcArg,
@@ -40,43 +43,68 @@ export class AsyncExecutionStack {
     return executionDeferred.promise;
   }
 
-  private currentlyExecutingDeferred: plugins.smartpromise.Deferred<any>;
   private async processExecutionSlots() {
-    if (this.currentlyExecutingDeferred) {
+    if (this.isProcessing) {
       return;
     }
-    this.currentlyExecutingDeferred = plugins.smartpromise.defer();
-    let nonExclusiveRunningSlots: IExecutionSlot<any>[] = [];
-    const checkNonExclusiveRunningSlots = async (cleanArg = false) => {
-      if (nonExclusiveRunningSlots.length > 100 || cleanArg) {
-        await Promise.all(nonExclusiveRunningSlots.map(nonExclusiveRunningSlotArg => nonExclusiveRunningSlotArg.executionDeferred.promise));
-        nonExclusiveRunningSlots = [];
-      }
-    };
+    this.isProcessing = true;
+
     while (this.executionSlots.length > 0) {
-      const nextExecutionSlot = this.executionSlots.shift();
-      const runNextExecution = async () => {
-        if (nextExecutionSlot.timeout) {
-          const result = await Promise.race([
-            nextExecutionSlot.funcToExecute(),
-            plugins.smartdelay.delayFor(nextExecutionSlot.timeout),
-          ]);
-          nextExecutionSlot.executionDeferred.resolve(result);
-        } else {
-          nextExecutionSlot.executionDeferred.resolve(await nextExecutionSlot.funcToExecute());
-        }
-      };
-      if (nextExecutionSlot.mode === 'exclusive') {
-        await checkNonExclusiveRunningSlots(true);
-        await runNextExecution();
+      const currentSlot = this.executionSlots[0];
+      if (currentSlot.mode === 'exclusive') {
+        await this.executeExclusiveSlot(currentSlot);
+        this.executionSlots.shift();
       } else {
-        nonExclusiveRunningSlots.push(nextExecutionSlot);
-        await checkNonExclusiveRunningSlots(false);
-        runNextExecution();
+        // Gather all non-exclusive slots at the front of the queue
+        const nonExclusiveSlots: IExecutionSlot<any>[] = [];
+        while (this.executionSlots.length > 0 && this.executionSlots[0].mode === 'nonexclusive') {
+          nonExclusiveSlots.push(this.executionSlots.shift()!);
+        }
+        await this.executeNonExclusiveSlots(nonExclusiveSlots);
       }
     }
-    this.currentlyExecutingDeferred.resolve();
-    this.currentlyExecutingDeferred = null;
-    
+    this.isProcessing = false;
+  }
+
+  private async executeExclusiveSlot(slot: IExecutionSlot<any>) {
+    try {
+      if (slot.timeout) {
+        const result = await Promise.race([
+          slot.funcToExecute(),
+          plugins.smartdelay.delayFor(slot.timeout).then(() => {
+            throw new Error('Timeout reached');
+          }),
+        ]);
+        slot.executionDeferred.resolve(result);
+      } else {
+        const result = await slot.funcToExecute();
+        slot.executionDeferred.resolve(result);
+      }
+    } catch (error) {
+      slot.executionDeferred.reject(error);
+    }
+  }
+
+  private async executeNonExclusiveSlots(slots: IExecutionSlot<any>[]) {
+    const promises = slots.map(async (slot) => {
+      try {
+        if (slot.timeout) {
+          const result = await Promise.race([
+            slot.funcToExecute(),
+            plugins.smartdelay.delayFor(slot.timeout).then(() => {
+              throw new Error('Timeout reached');
+            }),
+          ]);
+          slot.executionDeferred.resolve(result);
+        } else {
+          const result = await slot.funcToExecute();
+          slot.executionDeferred.resolve(result);
+        }
+      } catch (error) {
+        slot.executionDeferred.reject(error);
+      }
+    });
+
+    await Promise.all(promises);
   }
 }

ts/lik.interestmap.interest.ts

@@ -1,6 +1,6 @@
 import * as plugins from './lik.plugins.js';
 
-import { InterestMap, IInterestComparisonFunc } from './lik.interestmap.js';
+import { InterestMap, type IInterestComparisonFunc } from './lik.interestmap.js';
 
 export interface IInterestOptions<DTInterestFullfillment> {
   markLostAfterDefault: number;