From d11f5a0c724f7a3d1fa1a67921f133f9c3272780 Mon Sep 17 00:00:00 2001 From: Juergen Kunz Date: Mon, 1 Dec 2025 18:07:34 +0000 Subject: [PATCH] fix(deps): update @push.rocks/smartdata and @git.zone/tswatch versions; refactor App and Jwt manager instantiation --- package.json | 4 +-- pnpm-lock.yaml | 48 ++++++++++++++++-------------- ts/reception/classes.appmanager.ts | 5 ++-- ts/reception/classes.jwtmanager.ts | 2 +- 4 files changed, 31 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 5423123..6f86bbd 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@design.estate/dees-element": "^2.1.3", "@push.rocks/lik": "^6.2.2", "@push.rocks/qenv": "^6.1.3", - "@push.rocks/smartdata": "^7.0.14", + "@push.rocks/smartdata": "^7.0.15", "@push.rocks/smartdelay": "^3.0.5", "@push.rocks/smarthash": "^3.2.6", "@push.rocks/smartjson": "^5.2.0", @@ -52,7 +52,7 @@ "@git.zone/tsbuild": "^3.1.2", "@git.zone/tsbundle": "^2.6.2", "@git.zone/tsrun": "^2.0.0", - "@git.zone/tswatch": "^2.2.1", + "@git.zone/tswatch": "^2.2.2", "@push.rocks/projectinfo": "^5.0.1", "@types/node": "^24.10.1" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 568d396..2f41db8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,8 +39,8 @@ importers: specifier: ^6.1.3 version: 6.1.3 '@push.rocks/smartdata': - specifier: ^7.0.14 - version: 7.0.14 + specifier: ^7.0.15 + version: 7.0.15 '@push.rocks/smartdelay': specifier: ^3.0.5 version: 3.0.5 @@ -112,8 +112,8 @@ importers: specifier: ^2.0.0 version: 2.0.0 '@git.zone/tswatch': - specifier: ^2.2.1 - version: 2.2.1 + specifier: ^2.2.2 + version: 2.2.2 '@push.rocks/projectinfo': specifier: ^5.0.1 version: 5.0.2 @@ -687,16 +687,12 @@ packages: resolution: {integrity: sha512-o2/jvNsdLC8SRdH1kQ7JjNOQNu9el0FpJ/QOW3mgiC5C9reuTp18iU4kijsVVLgvw4KZv6Z289SoKPh3HPsS0g==} hasBin: true - '@git.zone/tsrun@1.6.2': - resolution: {integrity: sha512-SOHbQqBg3/769/jPQcdpPCmugdEtIJINiG0O6aWx+su91GvGhheha5dAhccsCutJYErr+aJcBqBYuUYfhOfkFQ==} - hasBin: true - '@git.zone/tsrun@2.0.0': resolution: {integrity: sha512-yA6zCjL+kn7xfZe6sL/m4K+zYqgkznG/pF6++i/E17iwzpG6dHmW+VZmYldHe86sW4DcLMvqM6CxM+KlgaEpKw==} hasBin: true - '@git.zone/tswatch@2.2.1': - resolution: {integrity: sha512-Q3CS0c2wEioeX8thyjZBZsriLsi6znCcV9S6j8ENb11986SS5N8YvhgPaOHkgcxFHQ/ShZpfC+VxS7GrxLvuMg==} + '@git.zone/tswatch@2.2.2': + resolution: {integrity: sha512-dscBvB1Pg8bIvMLHMPrOnkh0AHXE9v5zuSz9t9BBmWL1ecR94gPSmIYalObMvyMrtXW4L7mBne1kU8N7DY9Otw==} hasBin: true '@happy-dom/global-registrator@15.11.7': @@ -922,8 +918,8 @@ packages: '@push.rocks/smartdata@5.16.7': resolution: {integrity: sha512-bu/YSIjQcwxWXkAsuhqE6zs7eT+bTIKV8+/H7TbbjpzeioLCyB3dZ/41cLZk37c/EYt4d4GHgZ0ww80OiKOUMg==} - '@push.rocks/smartdata@7.0.14': - resolution: {integrity: sha512-FOb7E2gxzQo5G6McJa76YMrUp8tIeMo6pitDPKvb6q1x3k5r+CiulPui40EA9xklj4aT6wVMZo6Aozm+pOARMg==} + '@push.rocks/smartdata@7.0.15': + resolution: {integrity: sha512-j09BUekmjiGZuvXmdGBiIpBTXFFnxrzG4rOBjZvPO/hG1BwNrvSkIVq20mIwdYomn8JGgya6oJ4Y7NL+FKTqEA==} '@push.rocks/smartdelay@3.0.5': resolution: {integrity: sha512-mUuI7kj2f7ztjpic96FvRIlf2RsKBa5arw81AHNsndbxO6asRcxuWL8dTVxouEIK8YsBUlj0AsrCkHhMbLQdHw==} @@ -1087,6 +1083,10 @@ packages: '@push.rocks/smartversion@3.0.5': resolution: {integrity: sha512-8MZSo1yqyaKxKq0Q5N188l4un++9GFWVbhCAX5mXJwewZHn97ujffTeL+eOQYpWFTEpUhaq1QhL4NhqObBCt1Q==} + '@push.rocks/smartwatch@5.0.0': + resolution: {integrity: sha512-uuWUlTo0l5LWOWoOuTMG7zzxpUNKBcyqoB+zyQ24NHTtSYNcaUJtaQzTO2gxMXr5sqiZDkohlThS0KvsBc3g7w==} + engines: {node: '>=20.0.0'} + '@push.rocks/smartxml@2.0.0': resolution: {integrity: sha512-1d06zYJX4Zt8s5w5qFOUg2LAEz9ykrh9d6CQPK4WAgOBIefb1xzVEWHc7yoxicc2OkzNgC3IBCEg3s6BncZKWw==} @@ -4731,32 +4731,26 @@ snapshots: - supports-color - vue - '@git.zone/tsrun@1.6.2': - dependencies: - '@push.rocks/smartfile': 11.2.7 - '@push.rocks/smartshell': 3.3.0 - tsx: 4.20.6 - '@git.zone/tsrun@2.0.0': dependencies: '@push.rocks/smartfile': 11.2.7 '@push.rocks/smartshell': 3.3.0 tsx: 4.20.6 - '@git.zone/tswatch@2.2.1': + '@git.zone/tswatch@2.2.2': dependencies: '@api.global/typedserver': 3.0.80 '@git.zone/tsbundle': 2.6.2 - '@git.zone/tsrun': 1.6.2 + '@git.zone/tsrun': 2.0.0 '@push.rocks/early': 4.0.4 '@push.rocks/lik': 6.2.2 - '@push.rocks/smartchok': 1.2.0 '@push.rocks/smartcli': 4.0.19 '@push.rocks/smartdelay': 3.0.5 - '@push.rocks/smartfile': 11.2.7 + '@push.rocks/smartfs': 1.1.3 '@push.rocks/smartlog': 3.1.10 '@push.rocks/smartlog-destination-local': 9.0.2 '@push.rocks/smartshell': 3.3.0 + '@push.rocks/smartwatch': 5.0.0 '@push.rocks/taskbuffer': 3.4.0 transitivePeerDependencies: - '@nuxt/kit' @@ -5172,7 +5166,7 @@ snapshots: - supports-color - vue - '@push.rocks/smartdata@7.0.14': + '@push.rocks/smartdata@7.0.15': dependencies: '@push.rocks/lik': 6.2.2 '@push.rocks/smartdelay': 3.0.5 @@ -5626,6 +5620,14 @@ snapshots: '@types/semver': 7.7.1 semver: 7.7.3 + '@push.rocks/smartwatch@5.0.0': + dependencies: + '@push.rocks/lik': 6.2.2 + '@push.rocks/smartenv': 6.0.0 + '@push.rocks/smartpromise': 4.2.3 + '@push.rocks/smartrx': 3.0.10 + picomatch: 4.0.3 + '@push.rocks/smartxml@2.0.0': dependencies: fast-xml-parser: 5.3.2 diff --git a/ts/reception/classes.appmanager.ts b/ts/reception/classes.appmanager.ts index d6ae410..0ca77e4 100644 --- a/ts/reception/classes.appmanager.ts +++ b/ts/reception/classes.appmanager.ts @@ -1,6 +1,7 @@ import * as plugins from '../plugins.js'; import type { Reception } from './classes.reception.js'; import { App } from './classes.app.js'; +// Note: App class is imported for use with setDefaultManagerForDoc export class AppManager { public receptionRef: Reception; @@ -95,7 +96,7 @@ export class AppManager { const clientSecret = plugins.smartunique.shortId(32); const clientSecretHash = await plugins.smarthash.sha256FromString(clientSecret); - const app = new App(); + const app = new this.CApp(); app.id = `app-${plugins.smartunique.shortId(8)}`; app.type = 'global'; app.data = { @@ -304,7 +305,7 @@ export class AppManager { for (const appData of defaultGlobalApps) { const existing = await this.CApp.getInstance({ id: appData.id }); if (!existing) { - const app = new App(); + const app = new this.CApp(); app.id = appData.id!; app.type = appData.type!; app.data = appData.data as any; diff --git a/ts/reception/classes.jwtmanager.ts b/ts/reception/classes.jwtmanager.ts index 74d49a2..d28c3c5 100644 --- a/ts/reception/classes.jwtmanager.ts +++ b/ts/reception/classes.jwtmanager.ts @@ -122,7 +122,7 @@ export class JwtManager { public async verifyJWTAndGetData(jwtArg: string): Promise { const jwtData: plugins.idpInterfaces.data.IJwt = await this.smartjwtInstance.verifyJWTAndGetData(jwtArg); - const jwt = await Jwt.getInstance({ + const jwt = await this.CJwt.getInstance({ id: jwtData.id, }); if (jwt.blocked) {