Compare commits
102 Commits
Author | SHA1 | Date | |
---|---|---|---|
203a284c88 | |||
30ae641a9c | |||
cfe733621f | |||
1f76e2478e | |||
7d668bee05 | |||
bef7f68360 | |||
56e9754725 | |||
30d81581cf | |||
5e9db12955 | |||
ad2f422c86 | |||
17ce14bcb9 | |||
32319e6e77 | |||
4cd284eaa9 | |||
00ec2e57c2 | |||
765356ce3d | |||
56b8581d2b | |||
37a9df9086 | |||
090fb668cd | |||
a1c807261c | |||
a2ccf15f69 | |||
84d48f1914 | |||
1e258e5ffb | |||
19d5f553b9 | |||
7a257ea925 | |||
2fa1e89f34 | |||
d6b3896dd3 | |||
49b11b17ce | |||
4ac8a4c0cd | |||
7f9983382a | |||
54f529b0a7 | |||
f542463bf6 | |||
1235ae2eb3 | |||
8166d2f7c2 | |||
7c9f27e02f | |||
842e4b280b | |||
009f3297b2 | |||
2ff3a4e0b7 | |||
0e55cd8876 | |||
eccdf3f00a | |||
c7544133d9 | |||
c7c9acf5bd | |||
c99ec50853 | |||
4dd9557e1d | |||
52b34a6da1 | |||
1bf74fe04d | |||
fdd875ad31 | |||
a7bf0c0298 | |||
59d6336e43 | |||
e0fc81179a | |||
5aa81a56a2 | |||
9ae26177b8 | |||
26ac52d6c5 | |||
fb39463b7d | |||
44acba80c1 | |||
8cf8315577 | |||
9b44b64a50 | |||
699e25201c | |||
2ef9aace68 | |||
cc55a57dfd | |||
b2df512552 | |||
23c62fbd69 | |||
5f70ea0b05 | |||
49a595876a | |||
db38a1ef85 | |||
94854638dd | |||
902fab4cc0 | |||
ed3b19abc5 | |||
5b88da7dce | |||
df273e9efa | |||
fd590e0be3 | |||
ef97b390d4 | |||
cd14eb8bf3 | |||
f48443dcd3 | |||
3f28ff80cb | |||
64005a0b32 | |||
8a77bb3281 | |||
25f50ecf51 | |||
ad87f8147b | |||
da0c9873eb | |||
2fcd3f1550 | |||
f726cf4c5b | |||
c198969fae | |||
be1badeb23 | |||
fe065b966f | |||
811e2490b8 | |||
206ccd40e9 | |||
055298172f | |||
278f3c8169 | |||
0709ba921b | |||
de1f1110b4 | |||
30f4254428 | |||
1c4b03e647 | |||
27cc7651ba | |||
355a2a3f2b | |||
a739582861 | |||
37f9a64735 | |||
83a5170591 | |||
f94363cf31 | |||
df02e5bb71 | |||
38e438c54f | |||
11bc1ac6dc | |||
3431e94ddd |
66
.gitea/workflows/default_nottags.yaml
Normal file
66
.gitea/workflows/default_nottags.yaml
Normal file
@ -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
|
124
.gitea/workflows/default_tags.yaml
Normal file
124
.gitea/workflows/default_tags.yaml
Normal file
@ -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 @gitzone/tsdoc
|
||||||
|
npmci command tsdoc
|
||||||
|
continue-on-error: true
|
141
.gitlab-ci.yml
141
.gitlab-ci.yml
@ -1,141 +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:
|
|
||||||
- npm install -g @shipzone/npmci
|
|
||||||
|
|
||||||
# ====================
|
|
||||||
# security stage
|
|
||||||
# ====================
|
|
||||||
mirror:
|
|
||||||
stage: security
|
|
||||||
script:
|
|
||||||
- npmci git mirror
|
|
||||||
only:
|
|
||||||
- tags
|
|
||||||
tags:
|
|
||||||
- lossless
|
|
||||||
- docker
|
|
||||||
- notpriv
|
|
||||||
|
|
||||||
auditProductionDependencies:
|
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
|
||||||
stage: security
|
|
||||||
script:
|
|
||||||
- npmci npm prepare
|
|
||||||
- npmci command npm install --production --ignore-scripts
|
|
||||||
- npmci command npm config set registry https://registry.npmjs.org
|
|
||||||
- npmci command npm audit --audit-level=high --only=prod --production
|
|
||||||
tags:
|
|
||||||
- docker
|
|
||||||
allow_failure: true
|
|
||||||
|
|
||||||
auditDevDependencies:
|
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
|
||||||
stage: security
|
|
||||||
script:
|
|
||||||
- npmci npm prepare
|
|
||||||
- npmci command npm install --ignore-scripts
|
|
||||||
- npmci command npm config set registry https://registry.npmjs.org
|
|
||||||
- npmci command npm audit --audit-level=high --only=dev
|
|
||||||
tags:
|
|
||||||
- docker
|
|
||||||
allow_failure: true
|
|
||||||
|
|
||||||
# ====================
|
|
||||||
# test stage
|
|
||||||
# ====================
|
|
||||||
|
|
||||||
testStable:
|
|
||||||
stage: test
|
|
||||||
script:
|
|
||||||
- npmci npm prepare
|
|
||||||
- npmci node install stable
|
|
||||||
- npmci npm install
|
|
||||||
- npmci npm test
|
|
||||||
coverage: /\d+.?\d+?\%\s*coverage/
|
|
||||||
tags:
|
|
||||||
- docker
|
|
||||||
|
|
||||||
testBuild:
|
|
||||||
stage: test
|
|
||||||
script:
|
|
||||||
- npmci npm prepare
|
|
||||||
- npmci node install stable
|
|
||||||
- npmci npm install
|
|
||||||
- npmci command npm run 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 tslint typescript
|
|
||||||
- npmci npm prepare
|
|
||||||
- npmci npm install
|
|
||||||
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
|
||||||
tags:
|
|
||||||
- lossless
|
|
||||||
- docker
|
|
||||||
- priv
|
|
||||||
|
|
||||||
trigger:
|
|
||||||
stage: metadata
|
|
||||||
script:
|
|
||||||
- npmci trigger
|
|
||||||
only:
|
|
||||||
- tags
|
|
||||||
tags:
|
|
||||||
- lossless
|
|
||||||
- docker
|
|
||||||
- notpriv
|
|
||||||
|
|
||||||
pages:
|
|
||||||
stage: metadata
|
|
||||||
script:
|
|
||||||
- npmci node install lts
|
|
||||||
- npmci command npm install -g @gitzone/tsdoc
|
|
||||||
- npmci npm prepare
|
|
||||||
- npmci npm install
|
|
||||||
- npmci command tsdoc
|
|
||||||
tags:
|
|
||||||
- lossless
|
|
||||||
- docker
|
|
||||||
- notpriv
|
|
||||||
only:
|
|
||||||
- tags
|
|
||||||
artifacts:
|
|
||||||
expire_in: 1 week
|
|
||||||
paths:
|
|
||||||
- public
|
|
||||||
allow_failure: true
|
|
@ -12,12 +12,15 @@
|
|||||||
"gitzone": {
|
"gitzone": {
|
||||||
"projectType": "npm",
|
"projectType": "npm",
|
||||||
"module": {
|
"module": {
|
||||||
"githost": "gitlab.com",
|
"githost": "code.foss.global",
|
||||||
"gitscope": "pushrocks",
|
"gitscope": "push.rocks",
|
||||||
"gitrepo": "smartdata",
|
"gitrepo": "smartdata",
|
||||||
"shortDescription": "do more with data",
|
"description": "do more with data",
|
||||||
"npmPackagename": "@pushrocks/smartdata",
|
"npmPackagename": "@push.rocks/smartdata",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"tsdoc": {
|
||||||
|
"legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
|
||||||
}
|
}
|
||||||
}
|
}
|
27935
package-lock.json
generated
27935
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
50
package.json
50
package.json
@ -1,14 +1,15 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/smartdata",
|
"name": "@push.rocks/smartdata",
|
||||||
"version": "4.0.24",
|
"version": "5.0.43",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "do more with data",
|
"description": "do more with data",
|
||||||
"main": "dist_ts/index.js",
|
"main": "dist_ts/index.js",
|
||||||
"typings": "dist_ts/index.d.ts",
|
"typings": "dist_ts/index.d.ts",
|
||||||
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "(tstest test/)",
|
"test": "tstest test/",
|
||||||
"testLocal": "(npmdocker)",
|
"build": "tsbuild --web --allowimplicitany",
|
||||||
"build": "(tsbuild --web)"
|
"buildDocs": "tsdoc"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@ -21,29 +22,26 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://gitlab.com/pushrocks/smartdata#README",
|
"homepage": "https://gitlab.com/pushrocks/smartdata#README",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@pushrocks/lik": "^5.0.0",
|
"@push.rocks/lik": "^6.0.14",
|
||||||
"@pushrocks/smartlog": "^2.0.44",
|
"@push.rocks/smartdelay": "^3.0.1",
|
||||||
"@pushrocks/smartpromise": "^3.1.5",
|
"@push.rocks/smartlog": "^3.0.2",
|
||||||
"@pushrocks/smartstring": "^3.0.24",
|
"@push.rocks/smartmongo": "^2.0.10",
|
||||||
"@pushrocks/smartunique": "^3.0.3",
|
"@push.rocks/smartpromise": "^4.0.2",
|
||||||
"@tsclass/tsclass": "^3.0.36",
|
"@push.rocks/smartrx": "^3.0.7",
|
||||||
"@types/lodash": "^4.14.176",
|
"@push.rocks/smartstring": "^4.0.15",
|
||||||
"@types/mongodb": "^4.0.7",
|
"@push.rocks/smarttime": "^4.0.6",
|
||||||
"lodash": "^4.17.21",
|
"@push.rocks/smartunique": "^3.0.8",
|
||||||
"mongodb": "^4.1.4",
|
"@push.rocks/taskbuffer": "^3.1.7",
|
||||||
"runtime-type-checks": "0.0.4"
|
"@tsclass/tsclass": "^4.0.52",
|
||||||
|
"mongodb": "^6.5.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.28",
|
"@gitzone/tsbuild": "^2.1.66",
|
||||||
"@gitzone/tstest": "^1.0.60",
|
"@gitzone/tsrun": "^1.2.44",
|
||||||
"@pushrocks/qenv": "^4.0.10",
|
"@gitzone/tstest": "^1.0.77",
|
||||||
"@pushrocks/tapbundle": "^3.2.14",
|
"@push.rocks/qenv": "^6.0.5",
|
||||||
"@types/mongodb-memory-server": "^2.3.0",
|
"@push.rocks/tapbundle": "^5.0.22",
|
||||||
"@types/node": "^16.11.7",
|
"@types/node": "^20.11.30"
|
||||||
"@types/shortid": "0.0.29",
|
|
||||||
"mongodb-memory-server": "^8.0.2",
|
|
||||||
"tslint": "^6.1.3",
|
|
||||||
"tslint-config-prettier": "^1.18.0"
|
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"ts/**/*",
|
"ts/**/*",
|
||||||
|
6881
pnpm-lock.yaml
generated
Normal file
6881
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
30
readme.md
30
readme.md
@ -1,27 +1,26 @@
|
|||||||
# @pushrocks/smartdata
|
# @push.rocks/smartdata
|
||||||
do more with data
|
do more with data
|
||||||
|
|
||||||
## Availabililty and Links
|
## Availabililty and Links
|
||||||
* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartdata)
|
* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/smartdata)
|
||||||
* [gitlab.com (source)](https://gitlab.com/pushrocks/smartdata)
|
* [gitlab.com (source)](https://gitlab.com/push.rocks/smartdata)
|
||||||
* [github.com (source mirror)](https://github.com/pushrocks/smartdata)
|
* [github.com (source mirror)](https://github.com/push.rocks/smartdata)
|
||||||
* [docs (typedoc)](https://pushrocks.gitlab.io/smartdata/)
|
* [docs (typedoc)](https://push.rocks.gitlab.io/smartdata/)
|
||||||
|
|
||||||
## Status for master
|
## Status for master
|
||||||
|
|
||||||
Status Category | Status Badge
|
Status Category | Status Badge
|
||||||
-- | --
|
-- | --
|
||||||
GitLab Pipelines | [](https://lossless.cloud)
|
GitLab Pipelines | [](https://lossless.cloud)
|
||||||
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
||||||
npm | [](https://lossless.cloud)
|
npm | [](https://lossless.cloud)
|
||||||
Snyk | [](https://lossless.cloud)
|
Snyk | [](https://lossless.cloud)
|
||||||
TypeScript Support | [](https://lossless.cloud)
|
TypeScript Support | [](https://lossless.cloud)
|
||||||
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||||
Code Style | [](https://lossless.cloud)
|
Code Style | [](https://lossless.cloud)
|
||||||
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
||||||
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
||||||
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
||||||
Platform support | [](https://lossless.cloud) [](https://lossless.cloud)
|
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
@ -150,7 +149,6 @@ We are always happy for code contributions. If you are not the code contributing
|
|||||||
|
|
||||||
For further information read the linked docs at the top of this readme.
|
For further information read the linked docs at the top of this readme.
|
||||||
|
|
||||||
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
|
## Legal
|
||||||
|
> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
|
||||||
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
|
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
|
||||||
|
|
||||||
[](https://maintainedby.lossless.com)
|
|
||||||
|
112
test/test.distributedcoordinator.ts
Normal file
112
test/test.distributedcoordinator.ts
Normal file
@ -0,0 +1,112 @@
|
|||||||
|
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();
|
||||||
|
const initialTime = distributedCoordinator.ownInstance.data.lastUpdated;
|
||||||
|
await distributedCoordinator.sendHeartbeat();
|
||||||
|
const updatedTime = distributedCoordinator.ownInstance.data.lastUpdated;
|
||||||
|
expect(updatedTime).toBeGreaterThan(initialTime);
|
||||||
|
await distributedCoordinator.stop();
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.test('should instantiate SmartdataDistributedCoordinator', async (tools) => {
|
||||||
|
const distributedCoordinator = new SmartdataDistributedCoordinator(testDb);
|
||||||
|
await distributedCoordinator.start();
|
||||||
|
expect(distributedCoordinator).toBeInstanceOf(SmartdataDistributedCoordinator);
|
||||||
|
await distributedCoordinator.stop();
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.test('SmartdataDistributedCoordinator should update leader status', async (tools) => {
|
||||||
|
const distributedCoordinator = new SmartdataDistributedCoordinator(testDb);
|
||||||
|
await distributedCoordinator.start();
|
||||||
|
await distributedCoordinator.checkAndMaybeLead();
|
||||||
|
expect(distributedCoordinator.ownInstance.data.elected).toBeOneOf([true, false]);
|
||||||
|
await distributedCoordinator.stop();
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.test('SmartdataDistributedCoordinator should handle distributed task requests', async (tools) => {
|
||||||
|
const distributedCoordinator = new SmartdataDistributedCoordinator(testDb);
|
||||||
|
await distributedCoordinator.start();
|
||||||
|
|
||||||
|
const mockTaskRequest: taskbuffer.distributedCoordination.IDistributedTaskRequest = {
|
||||||
|
submitterId: "mockSubmitter12345", // Some unique mock submitter ID
|
||||||
|
requestResponseId: 'uni879873462hjhfkjhsdf', // Some unique ID for the request-response
|
||||||
|
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 distributedCoordinator.fireDistributedTaskRequest(mockTaskRequest);
|
||||||
|
console.log(response) // based on your expected structure for the response
|
||||||
|
await distributedCoordinator.stop();
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.test('SmartdataDistributedCoordinator should update distributed task requests', async (tools) => {
|
||||||
|
const distributedCoordinator = new SmartdataDistributedCoordinator(testDb);
|
||||||
|
|
||||||
|
await distributedCoordinator.start();
|
||||||
|
|
||||||
|
const mockTaskRequest: taskbuffer.distributedCoordination.IDistributedTaskRequest = {
|
||||||
|
submitterId: "mockSubmitter12345", // Some unique mock submitter ID
|
||||||
|
requestResponseId: 'uni879873462hjhfkjhsdf', // Some unique ID for the request-response
|
||||||
|
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 distributedCoordinator.updateDistributedTaskRequest(mockTaskRequest);
|
||||||
|
// Here, we can potentially check if a DB entry got updated or some other side-effect of the update method.
|
||||||
|
await distributedCoordinator.stop();
|
||||||
|
});
|
||||||
|
|
||||||
|
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.start()));
|
||||||
|
const leaders = coordinators.filter(coordinator => coordinator.ownInstance.data.elected);
|
||||||
|
for (const leader of leaders) {
|
||||||
|
console.log(leader.ownInstance);
|
||||||
|
}
|
||||||
|
expect(leaders.length).toEqual(1);
|
||||||
|
|
||||||
|
// stopping clears a coordinator from being elected.
|
||||||
|
await Promise.all(coordinators.map(coordinator => coordinator.stop()));
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.test('should clean up', async () => {
|
||||||
|
await smartmongoInstance.stopAndDumpToDir(`.nogit/dbdump/test.distributedcoordinator.ts`);
|
||||||
|
setTimeout(() => process.exit(), 2000);
|
||||||
|
})
|
||||||
|
|
||||||
|
tap.start({ throwOnError: true });
|
@ -1,40 +1,32 @@
|
|||||||
import { tap, expect } from '@pushrocks/tapbundle';
|
import { tap, expect } from '@push.rocks/tapbundle';
|
||||||
import { Qenv } from '@pushrocks/qenv';
|
import { Qenv } from '@push.rocks/qenv';
|
||||||
|
import * as smartmongo from '@push.rocks/smartmongo';
|
||||||
|
import { smartunique } from '../ts/smartdata.plugins.js';
|
||||||
|
|
||||||
const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
|
const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
|
||||||
|
|
||||||
console.log(process.memoryUsage());
|
console.log(process.memoryUsage());
|
||||||
|
|
||||||
// the tested module
|
// the tested module
|
||||||
import * as smartdata from '../ts/index';
|
import * as smartdata from '../ts/index.js';
|
||||||
|
|
||||||
import * as mongoPlugin from 'mongodb-memory-server';
|
|
||||||
import { smartunique } from '../ts/smartdata.plugins';
|
|
||||||
|
|
||||||
// =======================================
|
// =======================================
|
||||||
// Connecting to the database server
|
// Connecting to the database server
|
||||||
// =======================================
|
// =======================================
|
||||||
|
|
||||||
|
let smartmongoInstance: smartmongo.SmartMongo;
|
||||||
let testDb: smartdata.SmartdataDb;
|
let testDb: smartdata.SmartdataDb;
|
||||||
let smartdataOptions: smartdata.IMongoDescriptor;
|
|
||||||
let mongod: mongoPlugin.MongoMemoryServer;
|
|
||||||
|
|
||||||
tap.skip.test('should create a testinstance as database', async () => {
|
tap.test('should create a testinstance as database', async () => {
|
||||||
mongod = await mongoPlugin.MongoMemoryServer.create();
|
smartmongoInstance = await smartmongo.SmartMongo.createAndStart();
|
||||||
console.log('created mongod instance');
|
testDb = new smartdata.SmartdataDb(await smartmongoInstance.getMongoDescriptor());
|
||||||
console.log('mongod started');
|
|
||||||
smartdataOptions = {
|
|
||||||
mongoDbUrl: mongod.getUri(),
|
|
||||||
};
|
|
||||||
console.log(smartdataOptions);
|
|
||||||
testDb = new smartdata.SmartdataDb(smartdataOptions);
|
|
||||||
await testDb.init();
|
await testDb.init();
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should connect to atlas', async (tools) => {
|
tap.skip.test('should connect to atlas', async (tools) => {
|
||||||
const databaseName = `test-smartdata-${smartunique.shortId()}`;
|
const databaseName = `test-smartdata-${smartunique.shortId()}`;
|
||||||
testDb = new smartdata.SmartdataDb({
|
testDb = new smartdata.SmartdataDb({
|
||||||
mongoDbUrl: testQenv.getEnvVarOnDemand('MONGO_URL'),
|
mongoDbUrl: await testQenv.getEnvVarOnDemand('MONGO_URL'),
|
||||||
mongoDbName: databaseName,
|
mongoDbName: databaseName,
|
||||||
});
|
});
|
||||||
await testDb.init();
|
await testDb.init();
|
||||||
@ -49,16 +41,15 @@ tap.test('should create an easystore', async () => {
|
|||||||
easyStore = await testDb.createEasyStore('hellothere');
|
easyStore = await testDb.createEasyStore('hellothere');
|
||||||
await easyStore.writeKey('key1', 'hello');
|
await easyStore.writeKey('key1', 'hello');
|
||||||
const retrievedKey = await easyStore.readKey('key1');
|
const retrievedKey = await easyStore.readKey('key1');
|
||||||
expect(retrievedKey).to.equal('hello');
|
expect(retrievedKey).toEqual('hello');
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('close', async () => {
|
tap.test('close', async () => {
|
||||||
if (mongod) {
|
await testDb.mongoDb.dropDatabase();
|
||||||
await mongod.stop();
|
|
||||||
} else {
|
|
||||||
await testDb.mongoDb.dropDatabase();
|
|
||||||
}
|
|
||||||
await testDb.close();
|
await testDb.close();
|
||||||
|
if (smartmongoInstance) {
|
||||||
|
await smartmongoInstance.stop();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.start();
|
tap.start();
|
||||||
|
78
test/test.ts
78
test/test.ts
@ -1,42 +1,36 @@
|
|||||||
import { tap, expect } from '@pushrocks/tapbundle';
|
import { tap, expect } from '@push.rocks/tapbundle';
|
||||||
import { Qenv } from '@pushrocks/qenv';
|
import { Qenv } from '@push.rocks/qenv';
|
||||||
|
import * as smartmongo from '@push.rocks/smartmongo';
|
||||||
|
import { smartunique } from '../ts/smartdata.plugins.js';
|
||||||
|
|
||||||
|
import * as mongodb from 'mongodb';
|
||||||
|
|
||||||
const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
|
const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
|
||||||
|
|
||||||
console.log(process.memoryUsage());
|
console.log(process.memoryUsage());
|
||||||
|
|
||||||
// the tested module
|
// the tested module
|
||||||
import * as smartdata from '../ts/index';
|
import * as smartdata from '../ts/index.js';
|
||||||
|
|
||||||
import * as mongoPlugin from 'mongodb-memory-server';
|
|
||||||
import { smartunique } from '../ts/smartdata.plugins';
|
|
||||||
|
|
||||||
// =======================================
|
// =======================================
|
||||||
// Connecting to the database server
|
// Connecting to the database server
|
||||||
// =======================================
|
// =======================================
|
||||||
|
|
||||||
|
let smartmongoInstance: smartmongo.SmartMongo;
|
||||||
let testDb: smartdata.SmartdataDb;
|
let testDb: smartdata.SmartdataDb;
|
||||||
let smartdataOptions: smartdata.IMongoDescriptor;
|
|
||||||
let mongod: mongoPlugin.MongoMemoryServer;
|
|
||||||
|
|
||||||
const totalCars = 2000;
|
const totalCars = 2000;
|
||||||
|
|
||||||
tap.skip.test('should create a testinstance as database', async () => {
|
tap.test('should create a testinstance as database', async () => {
|
||||||
mongod = await mongoPlugin.MongoMemoryServer.create();
|
smartmongoInstance = await smartmongo.SmartMongo.createAndStart();
|
||||||
console.log('created mongod instance');
|
testDb = new smartdata.SmartdataDb(await smartmongoInstance.getMongoDescriptor());
|
||||||
console.log('mongod started');
|
|
||||||
smartdataOptions = {
|
|
||||||
mongoDbUrl: mongod.getUri(),
|
|
||||||
};
|
|
||||||
console.log(smartdataOptions);
|
|
||||||
testDb = new smartdata.SmartdataDb(smartdataOptions);
|
|
||||||
await testDb.init();
|
await testDb.init();
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should connect to atlas', async (tools) => {
|
tap.skip.test('should connect to atlas', async (tools) => {
|
||||||
const databaseName = `test-smartdata-${smartunique.shortId()}`;
|
const databaseName = `test-smartdata-${smartunique.shortId()}`;
|
||||||
testDb = new smartdata.SmartdataDb({
|
testDb = new smartdata.SmartdataDb({
|
||||||
mongoDbUrl: testQenv.getEnvVarOnDemand('MONGO_URL'),
|
mongoDbUrl: await testQenv.getEnvVarOnDemand('MONGO_URL'),
|
||||||
mongoDbName: databaseName,
|
mongoDbName: databaseName,
|
||||||
});
|
});
|
||||||
await testDb.init();
|
await testDb.init();
|
||||||
@ -63,6 +57,9 @@ class Car extends smartdata.SmartDataDbDoc<Car, Car> {
|
|||||||
@smartdata.svDb()
|
@smartdata.svDb()
|
||||||
public brand: string;
|
public brand: string;
|
||||||
|
|
||||||
|
@smartdata.svDb()
|
||||||
|
public testBuffer = Buffer.from('hello');
|
||||||
|
|
||||||
@smartdata.svDb()
|
@smartdata.svDb()
|
||||||
deepData = {
|
deepData = {
|
||||||
sodeep: 'yes',
|
sodeep: 'yes',
|
||||||
@ -75,7 +72,12 @@ class Car extends smartdata.SmartDataDbDoc<Car, Car> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tap.test('should save the car to the db', async () => {
|
tap.test('should create a new id', async () => {
|
||||||
|
const newid = await Car.getNewId();
|
||||||
|
console.log(newid);
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.test('should save the car to the db', async (toolsArg) => {
|
||||||
const myCar = new Car('red', 'Volvo');
|
const myCar = new Car('red', 'Volvo');
|
||||||
await myCar.save();
|
await myCar.save();
|
||||||
|
|
||||||
@ -83,6 +85,9 @@ tap.test('should save the car to the db', async () => {
|
|||||||
await myCar2.save();
|
await myCar2.save();
|
||||||
|
|
||||||
let counter = 0;
|
let counter = 0;
|
||||||
|
|
||||||
|
const gottenCarInstance = await Car.getInstance({});
|
||||||
|
console.log(gottenCarInstance.testBuffer instanceof mongodb.Binary);
|
||||||
process.memoryUsage();
|
process.memoryUsage();
|
||||||
do {
|
do {
|
||||||
const myCar3 = new Car('red', 'Renault');
|
const myCar3 = new Car('red', 'Renault');
|
||||||
@ -100,7 +105,7 @@ tap.test('should save the car to the db', async () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
tap.test('expect to get instance of Car with shallow match', async () => {
|
tap.test('expect to get instance of Car with shallow match', async () => {
|
||||||
const totalQueryCycles = totalCars / 4;
|
const totalQueryCycles = totalCars / 2;
|
||||||
let counter = 0;
|
let counter = 0;
|
||||||
do {
|
do {
|
||||||
const timeStart = Date.now();
|
const timeStart = Date.now();
|
||||||
@ -114,14 +119,14 @@ tap.test('expect to get instance of Car with shallow match', async () => {
|
|||||||
}ms to query a set of 2000 with memory footprint ${process.memoryUsage().rss / 1e6} MB`
|
}ms to query a set of 2000 with memory footprint ${process.memoryUsage().rss / 1e6} MB`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
expect(myCars[0].deepData.sodeep).to.equal('yes');
|
expect(myCars[0].deepData.sodeep).toEqual('yes');
|
||||||
expect(myCars[0].brand).to.equal('Renault');
|
expect(myCars[0].brand).toEqual('Renault');
|
||||||
counter++;
|
counter++;
|
||||||
} while (counter < totalQueryCycles);
|
} while (counter < totalQueryCycles);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('expect to get instance of Car with deep match', async () => {
|
tap.test('expect to get instance of Car with deep match', async () => {
|
||||||
const totalQueryCycles = totalCars / 4;
|
const totalQueryCycles = totalCars / 6;
|
||||||
let counter = 0;
|
let counter = 0;
|
||||||
do {
|
do {
|
||||||
const timeStart = Date.now();
|
const timeStart = Date.now();
|
||||||
@ -137,8 +142,8 @@ tap.test('expect to get instance of Car with deep match', async () => {
|
|||||||
}ms to deep query a set of 2000 with memory footprint ${process.memoryUsage().rss / 1e6} MB`
|
}ms to deep query a set of 2000 with memory footprint ${process.memoryUsage().rss / 1e6} MB`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
expect(myCars2[0].deepData.sodeep).to.equal('yes');
|
expect(myCars2[0].deepData.sodeep).toEqual('yes');
|
||||||
expect(myCars2[0].brand).to.equal('Volvo');
|
expect(myCars2[0].brand).toEqual('Volvo');
|
||||||
counter++;
|
counter++;
|
||||||
} while (counter < totalQueryCycles);
|
} while (counter < totalQueryCycles);
|
||||||
});
|
});
|
||||||
@ -147,7 +152,7 @@ tap.test('expect to get instance of Car and update it', async () => {
|
|||||||
const myCar = await Car.getInstance<Car>({
|
const myCar = await Car.getInstance<Car>({
|
||||||
brand: 'Volvo',
|
brand: 'Volvo',
|
||||||
});
|
});
|
||||||
expect(myCar.color).to.equal('red');
|
expect(myCar.color).toEqual('red');
|
||||||
myCar.color = 'blue';
|
myCar.color = 'blue';
|
||||||
await myCar.save();
|
await myCar.save();
|
||||||
});
|
});
|
||||||
@ -158,7 +163,7 @@ tap.test('should be able to delete an instance of car', async () => {
|
|||||||
color: 'blue',
|
color: 'blue',
|
||||||
});
|
});
|
||||||
console.log(myCars);
|
console.log(myCars);
|
||||||
expect(myCars[0].color).to.equal('blue');
|
expect(myCars[0].color).toEqual('blue');
|
||||||
for (const myCar of myCars) {
|
for (const myCar of myCars) {
|
||||||
await myCar.delete();
|
await myCar.delete();
|
||||||
}
|
}
|
||||||
@ -166,7 +171,7 @@ tap.test('should be able to delete an instance of car', async () => {
|
|||||||
const myCar2 = await Car.getInstance<Car>({
|
const myCar2 = await Car.getInstance<Car>({
|
||||||
brand: 'Volvo',
|
brand: 'Volvo',
|
||||||
});
|
});
|
||||||
expect(myCar2.color).to.equal('red');
|
expect(myCar2.color).toEqual('red');
|
||||||
});
|
});
|
||||||
|
|
||||||
// tslint:disable-next-line: max-classes-per-file
|
// tslint:disable-next-line: max-classes-per-file
|
||||||
@ -201,9 +206,11 @@ tap.test('should store a new Truck', async () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should use a cursor', async () => {
|
tap.test('should use a cursor', async () => {
|
||||||
const cursor = await Truck.getCursor({});
|
const cursor = await Car.getCursor({});
|
||||||
cursor.forEach(async (truckArg) => {
|
let counter = 0;
|
||||||
console.log(truckArg.id);
|
await cursor.forEach(async (carArg) => {
|
||||||
|
counter++;
|
||||||
|
counter % 50 === 0 ? console.log(`50 more of ${carArg.color}`) : null;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -211,12 +218,13 @@ tap.test('should use a cursor', async () => {
|
|||||||
// close the database connection
|
// close the database connection
|
||||||
// =======================================
|
// =======================================
|
||||||
tap.test('close', async () => {
|
tap.test('close', async () => {
|
||||||
if (mongod) {
|
if (smartmongoInstance) {
|
||||||
await mongod.stop();
|
await smartmongoInstance.stopAndDumpToDir('./.nogit/dbdump/test.ts');
|
||||||
} else {
|
} else {
|
||||||
await testDb.mongoDb.dropDatabase();
|
await testDb.mongoDb.dropDatabase();
|
||||||
|
await testDb.close();
|
||||||
}
|
}
|
||||||
await testDb.close();
|
setTimeout(() => process.exit(), 2000);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.start({ throwOnError: true });
|
tap.start({ throwOnError: true });
|
||||||
|
@ -1,42 +1,34 @@
|
|||||||
import { tap, expect } from '@pushrocks/tapbundle';
|
import { tap, expect } from '@push.rocks/tapbundle';
|
||||||
import { Qenv } from '@pushrocks/qenv';
|
import { Qenv } from '@push.rocks/qenv';
|
||||||
|
import * as smartmongo from '@push.rocks/smartmongo';
|
||||||
|
import { smartunique } from '../ts/smartdata.plugins.js';
|
||||||
|
|
||||||
const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
|
const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
|
||||||
|
|
||||||
console.log(process.memoryUsage());
|
console.log(process.memoryUsage());
|
||||||
|
|
||||||
// the tested module
|
// the tested module
|
||||||
import * as smartdata from '../ts/index';
|
import * as smartdata from '../ts/index.js';
|
||||||
|
|
||||||
import * as mongoPlugin from 'mongodb-memory-server';
|
|
||||||
import { smartunique } from '../ts/smartdata.plugins';
|
|
||||||
|
|
||||||
// =======================================
|
// =======================================
|
||||||
// Connecting to the database server
|
// Connecting to the database server
|
||||||
// =======================================
|
// =======================================
|
||||||
|
|
||||||
|
let smartmongoInstance: smartmongo.SmartMongo;
|
||||||
let testDb: smartdata.SmartdataDb;
|
let testDb: smartdata.SmartdataDb;
|
||||||
let smartdataOptions: smartdata.IMongoDescriptor;
|
|
||||||
let mongod: mongoPlugin.MongoMemoryServer;
|
|
||||||
|
|
||||||
const totalCars = 2000;
|
const totalCars = 2000;
|
||||||
|
|
||||||
tap.skip.test('should create a testinstance as database', async () => {
|
tap.test('should create a testinstance as database', async () => {
|
||||||
mongod = await mongoPlugin.MongoMemoryServer.create();
|
smartmongoInstance = await smartmongo.SmartMongo.createAndStart();
|
||||||
console.log('created mongod instance');
|
testDb = new smartdata.SmartdataDb(await smartmongoInstance.getMongoDescriptor());
|
||||||
console.log('mongod started');
|
|
||||||
smartdataOptions = {
|
|
||||||
mongoDbUrl: mongod.getUri(),
|
|
||||||
};
|
|
||||||
console.log(smartdataOptions);
|
|
||||||
testDb = new smartdata.SmartdataDb(smartdataOptions);
|
|
||||||
await testDb.init();
|
await testDb.init();
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should connect to atlas', async (tools) => {
|
tap.skip.test('should connect to atlas', async (tools) => {
|
||||||
const databaseName = `test-smartdata-${smartunique.shortId()}`;
|
const databaseName = `test-smartdata-${smartunique.shortId()}`;
|
||||||
testDb = new smartdata.SmartdataDb({
|
testDb = new smartdata.SmartdataDb({
|
||||||
mongoDbUrl: testQenv.getEnvVarOnDemand('MONGO_URL'),
|
mongoDbUrl: await testQenv.getEnvVarOnDemand('MONGO_URL'),
|
||||||
mongoDbName: databaseName,
|
mongoDbName: databaseName,
|
||||||
});
|
});
|
||||||
await testDb.init();
|
await testDb.init();
|
||||||
@ -93,12 +85,11 @@ tap.test('should get a car', async () => {
|
|||||||
// close the database connection
|
// close the database connection
|
||||||
// =======================================
|
// =======================================
|
||||||
tap.test('close', async () => {
|
tap.test('close', async () => {
|
||||||
if (mongod) {
|
await testDb.mongoDb.dropDatabase();
|
||||||
await mongod.stop();
|
|
||||||
} else {
|
|
||||||
await testDb.mongoDb.dropDatabase();
|
|
||||||
}
|
|
||||||
await testDb.close();
|
await testDb.close();
|
||||||
|
if (smartmongoInstance) {
|
||||||
|
await smartmongoInstance.stop();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.start({ throwOnError: true });
|
tap.start({ throwOnError: true });
|
||||||
|
74
test/test.watch.ts
Normal file
74
test/test.watch.ts
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
import { tap, expect } from '@push.rocks/tapbundle';
|
||||||
|
import { Qenv } from '@push.rocks/qenv';
|
||||||
|
import * as smartmongo from '@push.rocks/smartmongo';
|
||||||
|
import { smartunique } from '../ts/smartdata.plugins.js';
|
||||||
|
|
||||||
|
const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
|
||||||
|
|
||||||
|
console.log(process.memoryUsage());
|
||||||
|
|
||||||
|
// the tested module
|
||||||
|
import * as smartdata from '../ts/index.js';
|
||||||
|
|
||||||
|
// =======================================
|
||||||
|
// Connecting to the database server
|
||||||
|
// =======================================
|
||||||
|
|
||||||
|
let smartmongoInstance: smartmongo.SmartMongo;
|
||||||
|
let testDb: smartdata.SmartdataDb;
|
||||||
|
|
||||||
|
const totalCars = 2000;
|
||||||
|
|
||||||
|
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.skip.test('should connect to atlas', async (tools) => {
|
||||||
|
const databaseName = `test-smartdata-${smartunique.shortId()}`;
|
||||||
|
testDb = new smartdata.SmartdataDb({
|
||||||
|
mongoDbUrl: await testQenv.getEnvVarOnDemand('MONGO_URL'),
|
||||||
|
mongoDbName: databaseName,
|
||||||
|
});
|
||||||
|
await testDb.init();
|
||||||
|
});
|
||||||
|
|
||||||
|
@smartdata.Collection(() => testDb)
|
||||||
|
class House extends smartdata.SmartDataDbDoc<House, House> {
|
||||||
|
@smartdata.unI()
|
||||||
|
public id: string = smartunique.shortId();
|
||||||
|
|
||||||
|
@smartdata.svDb()
|
||||||
|
public data = {
|
||||||
|
id: smartunique.shortId(),
|
||||||
|
hello: 'hello',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
tap.test('should watch a collection', async (toolsArg) => {
|
||||||
|
const done = toolsArg.defer();
|
||||||
|
const watcher = await House.watch({});
|
||||||
|
watcher.changeSubject.subscribe(async (houseArg) => {
|
||||||
|
console.log('hey there, we observed a house');
|
||||||
|
await watcher.close();
|
||||||
|
done.resolve();
|
||||||
|
});
|
||||||
|
const newHouse = new House();
|
||||||
|
await newHouse.save();
|
||||||
|
console.log('saved a house');
|
||||||
|
await done.promise;
|
||||||
|
});
|
||||||
|
|
||||||
|
// =======================================
|
||||||
|
// close the database connection
|
||||||
|
// =======================================
|
||||||
|
tap.test('close', async () => {
|
||||||
|
await testDb.mongoDb.dropDatabase();
|
||||||
|
await testDb.close();
|
||||||
|
if (smartmongoInstance) {
|
||||||
|
await smartmongoInstance.stop();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.start({ throwOnError: true });
|
8
ts/00_commitinfo_data.ts
Normal file
8
ts/00_commitinfo_data.ts
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
/**
|
||||||
|
* autocreated commitinfo by @pushrocks/commitinfo
|
||||||
|
*/
|
||||||
|
export const commitinfo = {
|
||||||
|
name: '@push.rocks/smartdata',
|
||||||
|
version: '5.0.43',
|
||||||
|
description: 'do more with data'
|
||||||
|
}
|
18
ts/index.ts
18
ts/index.ts
@ -1,6 +1,14 @@
|
|||||||
export * from './smartdata.classes.db';
|
export * from './smartdata.classes.db.js';
|
||||||
export * from './smartdata.classes.collection';
|
export * from './smartdata.classes.collection.js';
|
||||||
export * from './smartdata.classes.doc';
|
export * from './smartdata.classes.doc.js';
|
||||||
export * from './smartdata.classes.easystore';
|
export * from './smartdata.classes.easystore.js';
|
||||||
|
export * from './smartdata.classes.cursor.js';
|
||||||
|
|
||||||
export { IMongoDescriptor } from './interfaces';
|
import * as convenience from './smartadata.convenience.js';
|
||||||
|
|
||||||
|
export { convenience };
|
||||||
|
|
||||||
|
// to be removed with the next breaking update
|
||||||
|
import type * as plugins from './smartdata.plugins.js';
|
||||||
|
type IMongoDescriptor = plugins.tsclass.database.IMongoDescriptor;
|
||||||
|
export type { IMongoDescriptor };
|
||||||
|
@ -1 +0,0 @@
|
|||||||
export * from './mongodescriptor';
|
|
@ -1,22 +0,0 @@
|
|||||||
export interface IMongoDescriptor {
|
|
||||||
/**
|
|
||||||
* the URL to connect to
|
|
||||||
*/
|
|
||||||
mongoDbUrl: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* the db to use for the project
|
|
||||||
*/
|
|
||||||
mongoDbName?: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* a username to use to connect to the database
|
|
||||||
*/
|
|
||||||
|
|
||||||
mongoDbUser?: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* an optional password that will be replace <PASSWORD> in the connection string
|
|
||||||
*/
|
|
||||||
mongoDbPass?: string;
|
|
||||||
}
|
|
5
ts/smartadata.convenience.ts
Normal file
5
ts/smartadata.convenience.ts
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
import * as plugins from './smartdata.plugins.js';
|
||||||
|
|
||||||
|
export const getNewUniqueId = async (prefixArg?: string) => {
|
||||||
|
return plugins.smartunique.uni(prefixArg);
|
||||||
|
};
|
@ -1,8 +1,9 @@
|
|||||||
import * as plugins from './smartdata.plugins';
|
import * as plugins from './smartdata.plugins.js';
|
||||||
import { SmartdataDb } from './smartdata.classes.db';
|
import { SmartdataDb } from './smartdata.classes.db.js';
|
||||||
import { SmartdataDbCursor } from './smartdata.classes.cursor';
|
import { SmartdataDbCursor } from './smartdata.classes.cursor.js';
|
||||||
import { SmartDataDbDoc } from './smartdata.classes.doc';
|
import { SmartDataDbDoc } from './smartdata.classes.doc.js';
|
||||||
import { CollectionFactory } from './smartdata.classes.collectionfactory';
|
import { SmartdataDbWatcher } from './smartdata.classes.watcher.js';
|
||||||
|
import { CollectionFactory } from './smartdata.classes.collectionfactory.js';
|
||||||
|
|
||||||
export interface IFindOptions {
|
export interface IFindOptions {
|
||||||
limit?: number;
|
limit?: number;
|
||||||
@ -25,7 +26,8 @@ const collectionFactory = new CollectionFactory();
|
|||||||
*/
|
*/
|
||||||
export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
|
export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
|
||||||
return function classDecorator<T extends { new (...args: any[]): {} }>(constructor: T) {
|
return function classDecorator<T extends { new (...args: any[]): {} }>(constructor: T) {
|
||||||
return class extends constructor {
|
const decoratedClass = class extends constructor {
|
||||||
|
public static className = constructor.name;
|
||||||
public static get collection() {
|
public static get collection() {
|
||||||
if (!(dbArg instanceof SmartdataDb)) {
|
if (!(dbArg instanceof SmartdataDb)) {
|
||||||
dbArg = dbArg();
|
dbArg = dbArg();
|
||||||
@ -39,6 +41,7 @@ export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
|
|||||||
return collectionFactory.getCollection(constructor.name, dbArg);
|
return collectionFactory.getCollection(constructor.name, dbArg);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
return decoratedClass;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -55,9 +58,10 @@ export const setDefaultManagerForDoc = <T>(managerArg: IManager, dbDocArg: T): T
|
|||||||
* This is a decorator that will tell the decorated class what dbTable to use
|
* This is a decorator that will tell the decorated class what dbTable to use
|
||||||
* @param dbArg
|
* @param dbArg
|
||||||
*/
|
*/
|
||||||
export function Manager<TManager extends IManager>(managerArg?: TManager | TDelayed<TManager>) {
|
export function managed<TManager extends IManager>(managerArg?: TManager | TDelayed<TManager>) {
|
||||||
return function classDecorator<T extends { new (...args: any[]): any }>(constructor: T) {
|
return function classDecorator<T extends { new (...args: any[]): any }>(constructor: T) {
|
||||||
return class extends constructor {
|
const decoratedClass = class extends constructor {
|
||||||
|
public static className = constructor.name;
|
||||||
public static get collection() {
|
public static get collection() {
|
||||||
let dbArg: SmartdataDb;
|
let dbArg: SmartdataDb;
|
||||||
if (!managerArg) {
|
if (!managerArg) {
|
||||||
@ -105,10 +109,15 @@ export function Manager<TManager extends IManager>(managerArg?: TManager | TDela
|
|||||||
return manager;
|
return manager;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
return decoratedClass;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// tslint:disable-next-line: max-classes-per-file
|
/**
|
||||||
|
* @dpecrecated use @managed instead
|
||||||
|
*/
|
||||||
|
export const Manager = managed;
|
||||||
|
|
||||||
export class SmartdataCollection<T> {
|
export class SmartdataCollection<T> {
|
||||||
/**
|
/**
|
||||||
* the collection that is used
|
* the collection that is used
|
||||||
@ -179,10 +188,13 @@ export class SmartdataCollection<T> {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getCursor(filterObject: any): Promise<SmartdataDbCursor<any>> {
|
public async getCursor(
|
||||||
|
filterObjectArg: any,
|
||||||
|
dbDocArg: typeof SmartDataDbDoc
|
||||||
|
): Promise<SmartdataDbCursor<any>> {
|
||||||
await this.init();
|
await this.init();
|
||||||
const cursor = this.mongoDbCollection.find(filterObject);
|
const cursor = this.mongoDbCollection.find(filterObjectArg);
|
||||||
return new SmartdataDbCursor(cursor);
|
return new SmartdataDbCursor(cursor, dbDocArg);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -196,6 +208,29 @@ export class SmartdataCollection<T> {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* watches the collection while applying a filter
|
||||||
|
*/
|
||||||
|
public async watch(
|
||||||
|
filterObject: any,
|
||||||
|
smartdataDbDocArg: typeof SmartDataDbDoc
|
||||||
|
): Promise<SmartdataDbWatcher> {
|
||||||
|
await this.init();
|
||||||
|
const changeStream = this.mongoDbCollection.watch(
|
||||||
|
[
|
||||||
|
{
|
||||||
|
$match: filterObject,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
{
|
||||||
|
fullDocument: 'updateLookup',
|
||||||
|
}
|
||||||
|
);
|
||||||
|
const smartdataWatcher = new SmartdataDbWatcher(changeStream, smartdataDbDocArg);
|
||||||
|
await smartdataWatcher.readyDeferred.promise;
|
||||||
|
return smartdataWatcher;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* create an object in the database
|
* create an object in the database
|
||||||
*/
|
*/
|
||||||
@ -243,7 +278,7 @@ export class SmartdataCollection<T> {
|
|||||||
* if this.objectValidation is not set it passes.
|
* if this.objectValidation is not set it passes.
|
||||||
*/
|
*/
|
||||||
private checkDoc(docArg: T): Promise<void> {
|
private checkDoc(docArg: T): Promise<void> {
|
||||||
const done = plugins.smartq.defer<void>();
|
const done = plugins.smartpromise.defer<void>();
|
||||||
let validationResult = true;
|
let validationResult = true;
|
||||||
if (this.objectValidation) {
|
if (this.objectValidation) {
|
||||||
validationResult = this.objectValidation(docArg);
|
validationResult = this.objectValidation(docArg);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import * as plugins from './smartdata.plugins';
|
import * as plugins from './smartdata.plugins.js';
|
||||||
import { SmartdataCollection } from './smartdata.classes.collection';
|
import { SmartdataCollection } from './smartdata.classes.collection.js';
|
||||||
import { SmartdataDb } from './smartdata.classes.db';
|
import { SmartdataDb } from './smartdata.classes.db.js';
|
||||||
|
|
||||||
export class CollectionFactory {
|
export class CollectionFactory {
|
||||||
public collections: { [key: string]: SmartdataCollection<any> } = {};
|
public collections: { [key: string]: SmartdataCollection<any> } = {};
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
import * as plugins from './smartdata.plugins';
|
import { SmartDataDbDoc } from './smartdata.classes.doc.js';
|
||||||
|
import * as plugins from './smartdata.plugins.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* a wrapper for the native mongodb cursor. Exposes better
|
* a wrapper for the native mongodb cursor. Exposes better
|
||||||
@ -8,12 +9,16 @@ export class SmartdataDbCursor<T = any> {
|
|||||||
|
|
||||||
// INSTANCE
|
// INSTANCE
|
||||||
public mongodbCursor: plugins.mongodb.FindCursor<T>;
|
public mongodbCursor: plugins.mongodb.FindCursor<T>;
|
||||||
constructor(cursorArg: plugins.mongodb.FindCursor<T>) {
|
private smartdataDbDoc: typeof SmartDataDbDoc;
|
||||||
|
constructor(cursorArg: plugins.mongodb.FindCursor<T>, dbDocArg: typeof SmartDataDbDoc) {
|
||||||
this.mongodbCursor = cursorArg;
|
this.mongodbCursor = cursorArg;
|
||||||
|
this.smartdataDbDoc = dbDocArg;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async next(closeAtEnd = true) {
|
public async next(closeAtEnd = true) {
|
||||||
const result = await this.mongodbCursor.next();
|
const result = this.smartdataDbDoc.createInstanceFromMongoDbNativeDoc(
|
||||||
|
await this.mongodbCursor.next()
|
||||||
|
);
|
||||||
if (!result && closeAtEnd) {
|
if (!result && closeAtEnd) {
|
||||||
await this.close();
|
await this.close();
|
||||||
}
|
}
|
||||||
@ -21,13 +26,15 @@ export class SmartdataDbCursor<T = any> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async forEach(forEachFuncArg: (itemArg: T) => Promise<any>, closeCursorAtEnd = true) {
|
public async forEach(forEachFuncArg: (itemArg: T) => Promise<any>, closeCursorAtEnd = true) {
|
||||||
let currentValue: T;
|
let nextDocument: any;
|
||||||
do {
|
do {
|
||||||
currentValue = await this.mongodbCursor.next();
|
nextDocument = await this.mongodbCursor.next();
|
||||||
if (currentValue) {
|
if (nextDocument) {
|
||||||
await forEachFuncArg(currentValue);
|
const nextClassInstance =
|
||||||
|
this.smartdataDbDoc.createInstanceFromMongoDbNativeDoc(nextDocument);
|
||||||
|
await forEachFuncArg(nextClassInstance as any);
|
||||||
}
|
}
|
||||||
} while (currentValue);
|
} while (nextDocument);
|
||||||
if (closeCursorAtEnd) {
|
if (closeCursorAtEnd) {
|
||||||
await this.close();
|
await this.close();
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,9 @@
|
|||||||
import * as plugins from './smartdata.plugins';
|
import * as plugins from './smartdata.plugins.js';
|
||||||
import { ObjectMap } from '@pushrocks/lik';
|
|
||||||
|
|
||||||
import { SmartdataCollection } from './smartdata.classes.collection';
|
import { SmartdataCollection } from './smartdata.classes.collection.js';
|
||||||
import { EasyStore } from './smartdata.classes.easystore';
|
import { EasyStore } from './smartdata.classes.easystore.js';
|
||||||
|
|
||||||
import { logger } from './smartdata.logging';
|
import { logger } from './smartdata.logging.js';
|
||||||
import { IMongoDescriptor } from './interfaces';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* interface - indicates the connection status of the db
|
* interface - indicates the connection status of the db
|
||||||
@ -13,13 +11,14 @@ import { IMongoDescriptor } from './interfaces';
|
|||||||
export type TConnectionStatus = 'initial' | 'disconnected' | 'connected' | 'failed';
|
export type TConnectionStatus = 'initial' | 'disconnected' | 'connected' | 'failed';
|
||||||
|
|
||||||
export class SmartdataDb {
|
export class SmartdataDb {
|
||||||
smartdataOptions: IMongoDescriptor;
|
smartdataOptions: plugins.tsclass.database.IMongoDescriptor;
|
||||||
mongoDbClient: plugins.mongodb.MongoClient;
|
mongoDbClient: plugins.mongodb.MongoClient;
|
||||||
mongoDb: plugins.mongodb.Db;
|
mongoDb: plugins.mongodb.Db;
|
||||||
status: TConnectionStatus;
|
status: TConnectionStatus;
|
||||||
smartdataCollectionMap = new ObjectMap<SmartdataCollection<any>>();
|
statusConnectedDeferred = plugins.smartpromise.defer();
|
||||||
|
smartdataCollectionMap = new plugins.lik.ObjectMap<SmartdataCollection<any>>();
|
||||||
|
|
||||||
constructor(smartdataOptions: IMongoDescriptor) {
|
constructor(smartdataOptions: plugins.tsclass.database.IMongoDescriptor) {
|
||||||
this.smartdataOptions = smartdataOptions;
|
this.smartdataOptions = smartdataOptions;
|
||||||
this.status = 'initial';
|
this.status = 'initial';
|
||||||
}
|
}
|
||||||
@ -52,6 +51,7 @@ export class SmartdataDb {
|
|||||||
});
|
});
|
||||||
this.mongoDb = this.mongoDbClient.db(this.smartdataOptions.mongoDbName);
|
this.mongoDb = this.mongoDbClient.db(this.smartdataOptions.mongoDbName);
|
||||||
this.status = 'connected';
|
this.status = 'connected';
|
||||||
|
this.statusConnectedDeferred.resolve();
|
||||||
console.log(`Connected to database ${this.smartdataOptions.mongoDbName}`);
|
console.log(`Connected to database ${this.smartdataOptions.mongoDbName}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
304
ts/smartdata.classes.distributedcoordinator.ts
Normal file
304
ts/smartdata.classes.distributedcoordinator.ts
Normal file
@ -0,0 +1,304 @@
|
|||||||
|
import * as plugins from './smartdata.plugins.js';
|
||||||
|
import { SmartdataDb } from './smartdata.classes.db.js';
|
||||||
|
import { managed, setDefaultManagerForDoc } from './smartdata.classes.collection.js';
|
||||||
|
import { SmartDataDbDoc, svDb, unI } from './smartdata.classes.doc.js';
|
||||||
|
import { SmartdataDbWatcher } from './smartdata.classes.watcher.js';
|
||||||
|
|
||||||
|
@managed()
|
||||||
|
export class DistributedClass extends SmartDataDbDoc<DistributedClass, DistributedClass> {
|
||||||
|
// INSTANCE
|
||||||
|
@unI()
|
||||||
|
public id: string;
|
||||||
|
|
||||||
|
@svDb()
|
||||||
|
public data: {
|
||||||
|
status: 'initializing' | 'bidding' | 'settled' | 'stopped';
|
||||||
|
biddingShortcode?: string;
|
||||||
|
biddingStartTime?: number;
|
||||||
|
lastUpdated: number;
|
||||||
|
elected: boolean;
|
||||||
|
/**
|
||||||
|
* used to store request
|
||||||
|
*/
|
||||||
|
taskRequests: plugins.taskbuffer.distributedCoordination.IDistributedTaskRequest[];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* only used by the leader to convey consultation results
|
||||||
|
*/
|
||||||
|
taskRequestResults: plugins.taskbuffer.distributedCoordination.IDistributedTaskRequestResult[];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This file implements a distributed coordinator according to the @pushrocks/taskbuffer standard.
|
||||||
|
* you should not set up this yourself. Instead, there is a factory on the SmartdataDb class
|
||||||
|
* that will take care of setting this up.
|
||||||
|
*/
|
||||||
|
export class SmartdataDistributedCoordinator extends plugins.taskbuffer.distributedCoordination
|
||||||
|
.AbstractDistributedCoordinator {
|
||||||
|
public readyPromise: Promise<any>;
|
||||||
|
public db: SmartdataDb;
|
||||||
|
private asyncExecutionStack = new plugins.lik.AsyncExecutionStack();
|
||||||
|
public ownInstance: DistributedClass;
|
||||||
|
public distributedWatcher: SmartdataDbWatcher<DistributedClass>;
|
||||||
|
|
||||||
|
constructor(dbArg: SmartdataDb) {
|
||||||
|
super();
|
||||||
|
this.db = dbArg;
|
||||||
|
setDefaultManagerForDoc(this, DistributedClass);
|
||||||
|
this.readyPromise = this.db.statusConnectedDeferred.promise;
|
||||||
|
}
|
||||||
|
|
||||||
|
// smartdata specific stuff
|
||||||
|
public async start() {
|
||||||
|
await this.init();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async stop() {
|
||||||
|
await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
if (this.distributedWatcher) {
|
||||||
|
await this.distributedWatcher.close();
|
||||||
|
}
|
||||||
|
if (this.ownInstance?.data.elected) {
|
||||||
|
this.ownInstance.data.elected = false;
|
||||||
|
}
|
||||||
|
if (this.ownInstance?.data.status === 'stopped') {
|
||||||
|
console.log(`stopping a distributed instance that has not been started yet.`);
|
||||||
|
}
|
||||||
|
this.ownInstance.data.status = 'stopped';
|
||||||
|
await this.ownInstance.save();
|
||||||
|
console.log(`stopped ${this.ownInstance.id}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public id = plugins.smartunique.uni('distributedInstance');
|
||||||
|
|
||||||
|
private startHeartbeat = async () => {
|
||||||
|
while (this.ownInstance.data.status !== 'stopped') {
|
||||||
|
await this.sendHeartbeat();
|
||||||
|
await plugins.smartdelay.delayForRandom(5000, 10000);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public async sendHeartbeat() {
|
||||||
|
await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
if (this.ownInstance.data.status === 'stopped') {
|
||||||
|
console.log(`aborted sending heartbeat because status is stopped`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await this.ownInstance.updateFromDb();
|
||||||
|
this.ownInstance.data.lastUpdated = Date.now();
|
||||||
|
await this.ownInstance.save();
|
||||||
|
console.log(`sent heartbeat for ${this.ownInstance.id}`);
|
||||||
|
const allInstances = DistributedClass.getInstances({});
|
||||||
|
});
|
||||||
|
if (this.ownInstance.data.status === 'stopped') {
|
||||||
|
console.log(`aborted sending heartbeat because status is stopped`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const eligibleLeader = await this.getEligibleLeader();
|
||||||
|
// not awaiting here because we don't want to block the heartbeat
|
||||||
|
this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
if (!eligibleLeader && this.ownInstance.data.status === 'settled') {
|
||||||
|
this.checkAndMaybeLead();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
private async init() {
|
||||||
|
await this.readyPromise;
|
||||||
|
if (!this.ownInstance) {
|
||||||
|
await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
this.ownInstance = new DistributedClass();
|
||||||
|
this.ownInstance.id = this.id;
|
||||||
|
this.ownInstance.data = {
|
||||||
|
elected: false,
|
||||||
|
lastUpdated: Date.now(),
|
||||||
|
status: 'initializing',
|
||||||
|
taskRequests: [],
|
||||||
|
taskRequestResults: [],
|
||||||
|
};
|
||||||
|
await this.ownInstance.save();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
console.warn(`distributed instance already initialized`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// lets enable the heartbeat
|
||||||
|
this.startHeartbeat();
|
||||||
|
|
||||||
|
// lets do a leader check
|
||||||
|
await this.checkAndMaybeLead();
|
||||||
|
|
||||||
|
return this.ownInstance;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async getEligibleLeader() {
|
||||||
|
return this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
const allInstances = await DistributedClass.getInstances({});
|
||||||
|
let leaders = allInstances.filter((instanceArg) => instanceArg.data.elected === true);
|
||||||
|
const eligibleLeader = leaders.find(
|
||||||
|
(leader) =>
|
||||||
|
leader.data.lastUpdated >=
|
||||||
|
Date.now() - plugins.smarttime.getMilliSecondsFromUnits({ seconds: 20 })
|
||||||
|
);
|
||||||
|
return eligibleLeader;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// --> leader election
|
||||||
|
public async checkAndMaybeLead() {
|
||||||
|
await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
this.ownInstance.data.status = 'initializing';
|
||||||
|
this.ownInstance.save();
|
||||||
|
});
|
||||||
|
if (await this.getEligibleLeader()) {
|
||||||
|
await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
await this.ownInstance.updateFromDb();
|
||||||
|
this.ownInstance.data.status = 'settled';
|
||||||
|
await this.ownInstance.save();
|
||||||
|
console.log(`${this.ownInstance.id} settled as follower`);
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
} else if (
|
||||||
|
(await DistributedClass.getInstances({})).find((instanceArg) => {
|
||||||
|
instanceArg.data.status === 'bidding' &&
|
||||||
|
instanceArg.data.biddingStartTime <= Date.now() - 4000 &&
|
||||||
|
instanceArg.data.biddingStartTime >= Date.now() - 30000;
|
||||||
|
})
|
||||||
|
) {
|
||||||
|
console.log('too late to the bidding party... waiting for next round.');
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
await this.ownInstance.updateFromDb();
|
||||||
|
this.ownInstance.data.status = 'bidding';
|
||||||
|
this.ownInstance.data.biddingStartTime = Date.now();
|
||||||
|
this.ownInstance.data.biddingShortcode = plugins.smartunique.shortId();
|
||||||
|
await this.ownInstance.save();
|
||||||
|
console.log('bidding code stored.');
|
||||||
|
});
|
||||||
|
console.log(`bidding for leadership...`);
|
||||||
|
await plugins.smartdelay.delayFor(
|
||||||
|
plugins.smarttime.getMilliSecondsFromUnits({ seconds: 5 })
|
||||||
|
);
|
||||||
|
await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
let biddingInstances = await DistributedClass.getInstances({});
|
||||||
|
biddingInstances = biddingInstances.filter(
|
||||||
|
(instanceArg) =>
|
||||||
|
instanceArg.data.status === 'bidding' &&
|
||||||
|
instanceArg.data.lastUpdated >=
|
||||||
|
Date.now() - plugins.smarttime.getMilliSecondsFromUnits({ seconds: 10 })
|
||||||
|
);
|
||||||
|
console.log(`found ${biddingInstances.length} bidding instances...`);
|
||||||
|
this.ownInstance.data.elected = true;
|
||||||
|
for (const biddingInstance of biddingInstances) {
|
||||||
|
if (biddingInstance.data.biddingShortcode < this.ownInstance.data.biddingShortcode) {
|
||||||
|
this.ownInstance.data.elected = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
await plugins.smartdelay.delayFor(5000);
|
||||||
|
console.log(`settling with status elected = ${this.ownInstance.data.elected}`);
|
||||||
|
this.ownInstance.data.status = 'settled';
|
||||||
|
await this.ownInstance.save();
|
||||||
|
});
|
||||||
|
if (this.ownInstance.data.elected) {
|
||||||
|
this.leadFunction();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* when it has been determined
|
||||||
|
* that this instance is leading
|
||||||
|
* the leading is implemented here
|
||||||
|
*/
|
||||||
|
public async leadFunction() {
|
||||||
|
this.distributedWatcher = await DistributedClass.watch({});
|
||||||
|
|
||||||
|
const currentTaskRequests: Array<{
|
||||||
|
taskName: string;
|
||||||
|
taskExecutionTime: number;
|
||||||
|
/**
|
||||||
|
* all instances that requested this task
|
||||||
|
*/
|
||||||
|
requestingDistibutedInstanceIds: string[];
|
||||||
|
responseTimeout: plugins.smartdelay.Timeout<any>;
|
||||||
|
}> = [];
|
||||||
|
|
||||||
|
this.distributedWatcher.changeSubject.subscribe({
|
||||||
|
next: async (distributedDoc) => {
|
||||||
|
if (!distributedDoc) {
|
||||||
|
console.log(`registered deletion of instance...`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
console.log(distributedDoc);
|
||||||
|
console.log(`registered change for ${distributedDoc.id}`);
|
||||||
|
distributedDoc;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
while (this.ownInstance.data.status !== 'stopped' && this.ownInstance.data.elected) {
|
||||||
|
const allInstances = await DistributedClass.getInstances({});
|
||||||
|
for (const instance of allInstances) {
|
||||||
|
if (instance.data.status === 'stopped') {
|
||||||
|
await instance.delete();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
await plugins.smartdelay.delayFor(10000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// abstract implemented methods
|
||||||
|
public async fireDistributedTaskRequest(
|
||||||
|
taskRequestArg: plugins.taskbuffer.distributedCoordination.IDistributedTaskRequest
|
||||||
|
): Promise<plugins.taskbuffer.distributedCoordination.IDistributedTaskRequestResult> {
|
||||||
|
await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
if (!this.ownInstance) {
|
||||||
|
console.error('instance need to be started first...');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await this.ownInstance.updateFromDb();
|
||||||
|
this.ownInstance.data.taskRequests.push(taskRequestArg);
|
||||||
|
await this.ownInstance.save();
|
||||||
|
});
|
||||||
|
await plugins.smartdelay.delayFor(10000);
|
||||||
|
const result = await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
await this.ownInstance.updateFromDb();
|
||||||
|
const taskRequestResult = this.ownInstance.data.taskRequestResults.find((resultItem) => {
|
||||||
|
return resultItem.requestResponseId === taskRequestArg.requestResponseId;
|
||||||
|
});
|
||||||
|
return taskRequestResult;
|
||||||
|
});
|
||||||
|
if (!result) {
|
||||||
|
console.warn('no result found for task request...');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async updateDistributedTaskRequest(
|
||||||
|
infoBasisArg: plugins.taskbuffer.distributedCoordination.IDistributedTaskRequest
|
||||||
|
): Promise<void> {
|
||||||
|
await this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
const existingInfoBasis = this.ownInstance.data.taskRequests.find((infoBasisItem) => {
|
||||||
|
return (
|
||||||
|
infoBasisItem.taskName === infoBasisArg.taskName &&
|
||||||
|
infoBasisItem.taskExecutionTime === infoBasisArg.taskExecutionTime
|
||||||
|
);
|
||||||
|
});
|
||||||
|
if (!existingInfoBasis) {
|
||||||
|
console.warn('trying to update a non existing task request... aborting!');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Object.assign(existingInfoBasis, infoBasisArg);
|
||||||
|
await this.ownInstance.save();
|
||||||
|
plugins.smartdelay.delayFor(60000).then(() => {
|
||||||
|
this.asyncExecutionStack.getExclusiveExecutionSlot(async () => {
|
||||||
|
const indexToRemove = this.ownInstance.data.taskRequests.indexOf(existingInfoBasis);
|
||||||
|
this.ownInstance.data.taskRequests.splice(indexToRemove, indexToRemove);
|
||||||
|
await this.ownInstance.save();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
@ -1,10 +1,9 @@
|
|||||||
import * as plugins from './smartdata.plugins';
|
import * as plugins from './smartdata.plugins.js';
|
||||||
|
|
||||||
import { ObjectMap } from '@pushrocks/lik';
|
import { SmartdataDb } from './smartdata.classes.db.js';
|
||||||
|
import { SmartdataDbCursor } from './smartdata.classes.cursor.js';
|
||||||
import { SmartdataDb } from './smartdata.classes.db';
|
import { type IManager, SmartdataCollection } from './smartdata.classes.collection.js';
|
||||||
import { SmartdataDbCursor } from './smartdata.classes.cursor';
|
import { SmartdataDbWatcher } from './smartdata.classes.watcher.js';
|
||||||
import { IManager, SmartdataCollection } from './smartdata.classes.collection';
|
|
||||||
|
|
||||||
export type TDocCreation = 'db' | 'new' | 'mixed';
|
export type TDocCreation = 'db' | 'new' | 'mixed';
|
||||||
|
|
||||||
@ -77,36 +76,7 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
|
|||||||
public static manager;
|
public static manager;
|
||||||
public manager: TManager;
|
public manager: TManager;
|
||||||
|
|
||||||
/**
|
// STATIC
|
||||||
* how the Doc in memory was created, may prove useful later.
|
|
||||||
*/
|
|
||||||
public creationStatus: TDocCreation = 'new';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* unique indexes
|
|
||||||
*/
|
|
||||||
public uniqueIndexes: string[];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* an array of saveable properties of a doc
|
|
||||||
*/
|
|
||||||
public saveableProperties: string[];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* name
|
|
||||||
*/
|
|
||||||
public name: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* primary id in the database
|
|
||||||
*/
|
|
||||||
public dbDocUniqueId: string;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* class constructor
|
|
||||||
*/
|
|
||||||
constructor() {}
|
|
||||||
|
|
||||||
public static createInstanceFromMongoDbNativeDoc<T>(
|
public static createInstanceFromMongoDbNativeDoc<T>(
|
||||||
this: plugins.tsclass.typeFest.Class<T>,
|
this: plugins.tsclass.typeFest.Class<T>,
|
||||||
mongoDbNativeDocArg: any
|
mongoDbNativeDocArg: any
|
||||||
@ -157,6 +127,13 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get a unique id prefixed with the class name
|
||||||
|
*/
|
||||||
|
public static async getNewId<T = any>(this: plugins.tsclass.typeFest.Class<T>, lengthArg: number = 20) {
|
||||||
|
return `${(this as any).className}:${plugins.smartunique.shortId(lengthArg)}`;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get cursor
|
* get cursor
|
||||||
* @returns
|
* @returns
|
||||||
@ -165,12 +142,32 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
|
|||||||
this: plugins.tsclass.typeFest.Class<T>,
|
this: plugins.tsclass.typeFest.Class<T>,
|
||||||
filterArg: plugins.tsclass.typeFest.PartialDeep<T>
|
filterArg: plugins.tsclass.typeFest.PartialDeep<T>
|
||||||
) {
|
) {
|
||||||
const cursor: SmartdataDbCursor<T> = await (this as any).collection.getCursor(
|
const collection: SmartdataCollection<T> = (this as any).collection;
|
||||||
convertFilterForMongoDb(filterArg)
|
const cursor: SmartdataDbCursor<T> = await collection.getCursor(
|
||||||
|
convertFilterForMongoDb(filterArg),
|
||||||
|
this as any as typeof SmartDataDbDoc
|
||||||
);
|
);
|
||||||
return cursor;
|
return cursor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* watch the collection
|
||||||
|
* @param this
|
||||||
|
* @param filterArg
|
||||||
|
* @param forEachFunction
|
||||||
|
*/
|
||||||
|
public static async watch<T>(
|
||||||
|
this: plugins.tsclass.typeFest.Class<T>,
|
||||||
|
filterArg: plugins.tsclass.typeFest.PartialDeep<T>
|
||||||
|
) {
|
||||||
|
const collection: SmartdataCollection<T> = (this as any).collection;
|
||||||
|
const watcher: SmartdataDbWatcher<T> = await collection.watch(
|
||||||
|
convertFilterForMongoDb(filterArg),
|
||||||
|
this as any
|
||||||
|
);
|
||||||
|
return watcher;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* run a function for all instances
|
* run a function for all instances
|
||||||
* @returns
|
* @returns
|
||||||
@ -184,6 +181,50 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
|
|||||||
await cursor.forEach(forEachFunction);
|
await cursor.forEach(forEachFunction);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// INSTANCE
|
||||||
|
|
||||||
|
/**
|
||||||
|
* how the Doc in memory was created, may prove useful later.
|
||||||
|
*/
|
||||||
|
public creationStatus: TDocCreation = 'new';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* updated from db in any case where doc comes from db
|
||||||
|
*/
|
||||||
|
@svDb()
|
||||||
|
_createdAt: number = Date.now();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* will be updated everytime the doc is saved
|
||||||
|
*/
|
||||||
|
@svDb()
|
||||||
|
_updatedAt: number = Date.now();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* unique indexes
|
||||||
|
*/
|
||||||
|
public uniqueIndexes: string[];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* an array of saveable properties of a doc
|
||||||
|
*/
|
||||||
|
public saveableProperties: string[];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* name
|
||||||
|
*/
|
||||||
|
public name: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* primary id in the database
|
||||||
|
*/
|
||||||
|
public dbDocUniqueId: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* class constructor
|
||||||
|
*/
|
||||||
|
constructor() {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* saves this instance but not any connected items
|
* saves this instance but not any connected items
|
||||||
* may lead to data inconsistencies, but is faster
|
* may lead to data inconsistencies, but is faster
|
||||||
@ -192,6 +233,9 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
|
|||||||
// tslint:disable-next-line: no-this-assignment
|
// tslint:disable-next-line: no-this-assignment
|
||||||
const self: any = this;
|
const self: any = this;
|
||||||
let dbResult: any;
|
let dbResult: any;
|
||||||
|
|
||||||
|
this._updatedAt = Date.now();
|
||||||
|
|
||||||
switch (this.creationStatus) {
|
switch (this.creationStatus) {
|
||||||
case 'db':
|
case 'db':
|
||||||
dbResult = await this.collection.update(self);
|
dbResult = await this.collection.update(self);
|
||||||
@ -217,9 +261,9 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
|
|||||||
* also store any referenced objects to DB
|
* also store any referenced objects to DB
|
||||||
* better for data consistency
|
* better for data consistency
|
||||||
*/
|
*/
|
||||||
public saveDeep(savedMapArg: ObjectMap<SmartDataDbDoc<any, any>> = null) {
|
public saveDeep(savedMapArg: plugins.lik.ObjectMap<SmartDataDbDoc<any, any>> = null) {
|
||||||
if (!savedMapArg) {
|
if (!savedMapArg) {
|
||||||
savedMapArg = new ObjectMap<SmartDataDbDoc<any, any>>();
|
savedMapArg = new plugins.lik.ObjectMap<SmartDataDbDoc<any, any>>();
|
||||||
}
|
}
|
||||||
savedMapArg.add(this);
|
savedMapArg.add(this);
|
||||||
this.save();
|
this.save();
|
||||||
@ -231,6 +275,16 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* updates an object from db
|
||||||
|
*/
|
||||||
|
public async updateFromDb() {
|
||||||
|
const mongoDbNativeDoc = await this.collection.findOne(await this.createIdentifiableObject());
|
||||||
|
for (const key of Object.keys(mongoDbNativeDoc)) {
|
||||||
|
this[key] = mongoDbNativeDoc[key];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* creates a saveable object so the instance can be persisted as json in the database
|
* creates a saveable object so the instance can be persisted as json in the database
|
||||||
*/
|
*/
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import * as plugins from './smartdata.plugins';
|
import * as plugins from './smartdata.plugins.js';
|
||||||
import { Collection } from './smartdata.classes.collection';
|
import { Collection } from './smartdata.classes.collection.js';
|
||||||
import { SmartdataDb } from './smartdata.classes.db';
|
import { SmartdataDb } from './smartdata.classes.db.js';
|
||||||
import { SmartDataDbDoc, svDb, unI } from './smartdata.classes.doc';
|
import { SmartDataDbDoc, svDb, unI } from './smartdata.classes.doc.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EasyStore allows the storage of easy objects. It also allows easy sharing of the object between different instances
|
* EasyStore allows the storage of easy objects. It also allows easy sharing of the object between different instances
|
||||||
@ -17,6 +17,15 @@ export class EasyStore<T> {
|
|||||||
@unI()
|
@unI()
|
||||||
public nameId: string;
|
public nameId: string;
|
||||||
|
|
||||||
|
@svDb()
|
||||||
|
public ephermal: {
|
||||||
|
activated: boolean;
|
||||||
|
timeout: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
@svDb()
|
||||||
|
lastEdit: number;
|
||||||
|
|
||||||
@svDb()
|
@svDb()
|
||||||
public data: Partial<T>;
|
public data: Partial<T>;
|
||||||
}
|
}
|
||||||
@ -28,7 +37,16 @@ export class EasyStore<T> {
|
|||||||
this.nameId = nameIdArg;
|
this.nameId = nameIdArg;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async getEasyStore() {
|
private easyStorePromise: Promise<InstanceType<typeof this.easyStoreClass>>;
|
||||||
|
private async getEasyStore(): Promise<InstanceType<typeof this.easyStoreClass>> {
|
||||||
|
if (this.easyStorePromise) {
|
||||||
|
return this.easyStorePromise;
|
||||||
|
};
|
||||||
|
|
||||||
|
// first run from here
|
||||||
|
const deferred = plugins.smartpromise.defer<InstanceType<typeof this.easyStoreClass>>();
|
||||||
|
this.easyStorePromise = deferred.promise;
|
||||||
|
|
||||||
let easyStore = await this.easyStoreClass.getInstance({
|
let easyStore = await this.easyStoreClass.getInstance({
|
||||||
nameId: this.nameId,
|
nameId: this.nameId,
|
||||||
});
|
});
|
||||||
@ -39,7 +57,8 @@ export class EasyStore<T> {
|
|||||||
easyStore.data = {};
|
easyStore.data = {};
|
||||||
await easyStore.save();
|
await easyStore.save();
|
||||||
}
|
}
|
||||||
return easyStore;
|
deferred.resolve(easyStore);
|
||||||
|
return this.easyStorePromise;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -61,7 +80,7 @@ export class EasyStore<T> {
|
|||||||
/**
|
/**
|
||||||
* writes a specific key to the keyValueStore
|
* writes a specific key to the keyValueStore
|
||||||
*/
|
*/
|
||||||
public async writeKey(keyArg: keyof T, valueArg: any) {
|
public async writeKey<TKey extends keyof T>(keyArg: TKey, valueArg: T[TKey]) {
|
||||||
const easyStore = await this.getEasyStore();
|
const easyStore = await this.getEasyStore();
|
||||||
easyStore.data[keyArg] = valueArg;
|
easyStore.data[keyArg] = valueArg;
|
||||||
await easyStore.save();
|
await easyStore.save();
|
||||||
@ -90,4 +109,11 @@ export class EasyStore<T> {
|
|||||||
easyStore.data = {};
|
easyStore.data = {};
|
||||||
await easyStore.save();
|
await easyStore.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async cleanUpEphermal() {
|
||||||
|
while (
|
||||||
|
(await this.smartdataDbRef.statusConnectedDeferred.promise) &&
|
||||||
|
this.smartdataDbRef.status === 'connected'
|
||||||
|
) {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
37
ts/smartdata.classes.watcher.ts
Normal file
37
ts/smartdata.classes.watcher.ts
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
import { SmartDataDbDoc } from './smartdata.classes.doc.js';
|
||||||
|
import * as plugins from './smartdata.plugins.js';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* a wrapper for the native mongodb cursor. Exposes better
|
||||||
|
*/
|
||||||
|
export class SmartdataDbWatcher<T = any> {
|
||||||
|
// STATIC
|
||||||
|
public readyDeferred = plugins.smartpromise.defer();
|
||||||
|
|
||||||
|
// INSTANCE
|
||||||
|
private changeStream: plugins.mongodb.ChangeStream<T>;
|
||||||
|
|
||||||
|
public changeSubject = new plugins.smartrx.rxjs.Subject<T>();
|
||||||
|
constructor(
|
||||||
|
changeStreamArg: plugins.mongodb.ChangeStream<T>,
|
||||||
|
smartdataDbDocArg: typeof SmartDataDbDoc
|
||||||
|
) {
|
||||||
|
this.changeStream = changeStreamArg;
|
||||||
|
this.changeStream.on('change', async (item: any) => {
|
||||||
|
if (!item.fullDocument) {
|
||||||
|
this.changeSubject.next(null);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.changeSubject.next(
|
||||||
|
smartdataDbDocArg.createInstanceFromMongoDbNativeDoc(item.fullDocument) as any as T
|
||||||
|
);
|
||||||
|
});
|
||||||
|
plugins.smartdelay.delayFor(0).then(() => {
|
||||||
|
this.readyDeferred.resolve();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public async close() {
|
||||||
|
await this.changeStream.close();
|
||||||
|
}
|
||||||
|
}
|
@ -1,3 +1,3 @@
|
|||||||
import * as plugins from './smartdata.plugins';
|
import * as plugins from './smartdata.plugins.js';
|
||||||
|
|
||||||
export const logger = new plugins.smartlog.ConsoleLog();
|
export const logger = new plugins.smartlog.ConsoleLog();
|
||||||
|
@ -4,11 +4,26 @@ import * as tsclass from '@tsclass/tsclass';
|
|||||||
export { tsclass };
|
export { tsclass };
|
||||||
|
|
||||||
// @pushrocks scope
|
// @pushrocks scope
|
||||||
import * as smartlog from '@pushrocks/smartlog';
|
import * as lik from '@push.rocks/lik';
|
||||||
import * as lodash from 'lodash';
|
import * as smartdelay from '@push.rocks/smartdelay';
|
||||||
|
import * as smartlog from '@push.rocks/smartlog';
|
||||||
|
import * as smartpromise from '@push.rocks/smartpromise';
|
||||||
|
import * as smartrx from '@push.rocks/smartrx';
|
||||||
|
import * as smartstring from '@push.rocks/smartstring';
|
||||||
|
import * as smarttime from '@push.rocks/smarttime';
|
||||||
|
import * as smartunique from '@push.rocks/smartunique';
|
||||||
|
import * as taskbuffer from '@push.rocks/taskbuffer';
|
||||||
import * as mongodb from 'mongodb';
|
import * as mongodb from 'mongodb';
|
||||||
import * as smartq from '@pushrocks/smartpromise';
|
|
||||||
import * as smartstring from '@pushrocks/smartstring';
|
|
||||||
import * as smartunique from '@pushrocks/smartunique';
|
|
||||||
|
|
||||||
export { smartlog, lodash, smartq, mongodb, smartstring, smartunique };
|
export {
|
||||||
|
lik,
|
||||||
|
smartdelay,
|
||||||
|
smartpromise,
|
||||||
|
smartlog,
|
||||||
|
smartrx,
|
||||||
|
mongodb,
|
||||||
|
smartstring,
|
||||||
|
smarttime,
|
||||||
|
smartunique,
|
||||||
|
taskbuffer,
|
||||||
|
};
|
||||||
|
@ -1,7 +1,14 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
"target": "es2017",
|
"useDefineForClassFields": false,
|
||||||
"module": "commonjs"
|
"target": "ES2022",
|
||||||
}
|
"module": "NodeNext",
|
||||||
}
|
"moduleResolution": "NodeNext",
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"verbatimModuleSyntax": true
|
||||||
|
},
|
||||||
|
"exclude": [
|
||||||
|
"dist_*/**/*.d.ts"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
17
tslint.json
17
tslint.json
@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"extends": ["tslint:latest", "tslint-config-prettier"],
|
|
||||||
"rules": {
|
|
||||||
"semicolon": [true, "always"],
|
|
||||||
"no-console": false,
|
|
||||||
"ordered-imports": false,
|
|
||||||
"object-literal-sort-keys": false,
|
|
||||||
"member-ordering": {
|
|
||||||
"options":{
|
|
||||||
"order": [
|
|
||||||
"static-method"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"defaultSeverity": "warning"
|
|
||||||
}
|
|
Reference in New Issue
Block a user