From b4e26d6d6a234f56c40891fabc462b514ba2a106 Mon Sep 17 00:00:00 2001 From: Juergen Kunz Date: Thu, 4 Dec 2025 00:03:23 +0000 Subject: [PATCH] fix(web_inject): Use TypedSocket status API in web_inject and bump dependencies --- changelog.md | 7 ++ package.json | 6 +- pnpm-lock.yaml | 250 +++++++++++++++++++-------------------- ts/00_commitinfo_data.ts | 2 +- ts_web_inject/index.ts | 16 +-- 5 files changed, 137 insertions(+), 144 deletions(-) diff --git a/changelog.md b/changelog.md index 4d7a8b7..b890f79 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # Changelog +## 2025-12-04 - 6.0.1 - fix(web_inject) +Use TypedSocket status API in web_inject and bump dependencies + +- ts_web_inject: switch from typedsocket.addTag + eventSubject to await typedsocket.setTag + statusSubject; update logging and handle 'reconnecting' status as backend connection loss +- Await setTag call to ensure tag is applied before relying on socket state +- Bump dependencies: @api.global/typedrequest -> ^3.1.11, @api.global/typedsocket -> ^4.1.0, @push.rocks/smartserve -> ^1.1.2 + ## 2025-12-03 - 6.0.0 - BREAKING CHANGE(servertools.Server.addTypedSocket) Deprecate Server.addTypedSocket and upgrade typedsocket to v4; make addTypedSocket a no-op and log a deprecation warning. Bump tsbundle devDependency. diff --git a/package.json b/package.json index 31cf1e5..faeaf38 100644 --- a/package.json +++ b/package.json @@ -58,9 +58,9 @@ ], "homepage": "https://code.foss.global/api.global/typedserver", "dependencies": { - "@api.global/typedrequest": "^3.1.10", + "@api.global/typedrequest": "^3.1.11", "@api.global/typedrequest-interfaces": "^3.0.19", - "@api.global/typedsocket": "^4.0.0", + "@api.global/typedsocket": "^4.1.0", "@cloudflare/workers-types": "^4.20251202.0", "@design.estate/dees-comms": "^1.0.27", "@push.rocks/lik": "^6.2.2", @@ -82,7 +82,7 @@ "@push.rocks/smartpromise": "^4.2.3", "@push.rocks/smartrequest": "^5.0.1", "@push.rocks/smartrx": "^3.0.10", - "@push.rocks/smartserve": "^1.1.0", + "@push.rocks/smartserve": "^1.1.2", "@push.rocks/smartsitemap": "^2.0.4", "@push.rocks/smartstream": "^3.2.5", "@push.rocks/smarttime": "^4.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 192e07e..1f2d145 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,14 +9,14 @@ importers: .: dependencies: '@api.global/typedrequest': - specifier: ^3.1.10 - version: 3.1.10 + specifier: ^3.1.11 + version: 3.1.11 '@api.global/typedrequest-interfaces': specifier: ^3.0.19 version: 3.0.19 '@api.global/typedsocket': - specifier: ^4.0.0 - version: 4.0.0(@push.rocks/smartserve@1.1.0) + specifier: ^4.1.0 + version: 4.1.0(@push.rocks/smartserve@1.1.2) '@cloudflare/workers-types': specifier: ^4.20251202.0 version: 4.20251202.0 @@ -81,8 +81,8 @@ importers: specifier: ^3.0.10 version: 3.0.10 '@push.rocks/smartserve': - specifier: ^1.1.0 - version: 1.1.0 + specifier: ^1.1.2 + version: 1.1.2 '@push.rocks/smartsitemap': specifier: ^2.0.4 version: 2.0.4 @@ -137,7 +137,7 @@ importers: version: 2.0.0 '@git.zone/tstest': specifier: ^3.1.3 - version: 3.1.3(@aws-sdk/credential-providers@3.787.0)(@push.rocks/smartserve@1.1.0)(socks@2.8.7)(typescript@5.9.3) + version: 3.1.3(@aws-sdk/credential-providers@3.787.0)(@push.rocks/smartserve@1.1.2)(socks@2.8.7)(typescript@5.9.3) '@types/node': specifier: ^24.10.1 version: 24.10.1 @@ -150,8 +150,8 @@ packages: '@api.global/typedrequest-interfaces@3.0.19': resolution: {integrity: sha512-uuHUXJeOy/inWSDrwD0Cwax2rovpxYllDhM2RWh+6mVpQuNmZ3uw6IVg6dA2G1rOe24Ebs+Y9SzEogo+jYN7vw==} - '@api.global/typedrequest@3.1.10': - resolution: {integrity: sha512-EiCp44XVcMjBvEs4oM1nMUaeY4ySU0Pzt3+mDwVG5DNP6EV87Nwancbr2jKScvaFNel9eeDgGtgEnFBKjOnApA==} + '@api.global/typedrequest@3.1.11': + resolution: {integrity: sha512-j8EO3na0WMw8pFkAfEaEui2a4TaAL1G/dv1CYl8LEPXckSKkl1BCAS1kFOW2xuI9pwZkmSqlo3xpQ3KmkmHaGQ==} '@api.global/typedserver@3.0.80': resolution: {integrity: sha512-dcp0oXsjBL+XdFg1wUUP08uJQid5bQ0Yv3V3Y3lnI2QCbat0FU+Tsb0TZRnZ4+P150Vj/ITBqJUgDzFsF34grA==} @@ -164,13 +164,10 @@ packages: '@push.rocks/smartserve': optional: true - '@api.global/typedsocket@4.0.0': - resolution: {integrity: sha512-3JQdLcBRcb2Ch/kknISqivHCV8qxEd8/calu95rUoG1/FbQUdKtRNTS9j7pox91oHG7PGW2kXQbMkRx7Ir6F7Q==} + '@api.global/typedsocket@4.1.0': + resolution: {integrity: sha512-ttmoU5BNHmLAkAF/o+Ta8F5O4F7CUmkFo6LK7NKHQvuYJvodPMYWdhJ6yCINTF4pfCgljkMDUqoVKobm6ea4mQ==} peerDependencies: - '@push.rocks/smartserve': '>=1.0.0' - peerDependenciesMeta: - '@push.rocks/smartserve': - optional: true + '@push.rocks/smartserve': '>=1.1.0' '@aws-crypto/crc32@5.2.0': resolution: {integrity: sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==} @@ -1071,9 +1068,6 @@ packages: '@push.rocks/smartbucket@4.3.0': resolution: {integrity: sha512-4nstzEduCKou4R5ekKH6kUjDZXWfrtjA1hIQ4MJmTbtncmm2+4+ixjaFThS2nS8Aa+fHcBgOtKkBv8wTsgvK/Q==} - '@push.rocks/smartbuffer@3.0.4': - resolution: {integrity: sha512-TLfhx/JD61YC8XGO9TI6Ux6US38R14HaIM84QT8hZZod8axfXrg+h8xA8tMUBpSV8PXsQy9LzxmOq0Il1fmDXw==} - '@push.rocks/smartbuffer@3.0.5': resolution: {integrity: sha512-pWYF08Mn8s/KF/9nHRk7pZPzuMjmYVQay2c5gGexdayxn1W4eCSYYhWH73vR2JBfGeGq/izbRNuUuEaIEeTIKA==} @@ -1222,8 +1216,8 @@ packages: '@push.rocks/smarts3@3.0.3': resolution: {integrity: sha512-Y9nXMwurthJ9Z7yi0RwjhPFUC58aY8Mhia8kFo6Xj1tBM4LE8Oxg/ydejF7otHqQGr3QyqV5C4YrDEG17rUuzg==} - '@push.rocks/smartserve@1.1.0': - resolution: {integrity: sha512-w9cSRw+ia5oWXcuK1QCBCEUUPsAJ2zDeOv1gHDytL+2e1oLlRAEp35uhWFHGPsTCZiwgVZhy3ZORWemJTODQlQ==} + '@push.rocks/smartserve@1.1.2': + resolution: {integrity: sha512-NkJNgdDt/rfsd9AMheCxtFd5X+ubzffvxOxjb0Aw1A5JR3xmiWeRifqEV1oN7mMTGL9jyQVvIME6Yrdxr244dA==} '@push.rocks/smartshell@3.3.0': resolution: {integrity: sha512-m0w618H6YBs+vXGz1CgS4nPi5CUAnqRtckcS9/koGwfcIx1IpjqmiP47BoCTbdgcv0IPUxQVBG1IXTHPuZ8Z5g==} @@ -1234,9 +1228,6 @@ packages: '@push.rocks/smartsocket@2.1.0': resolution: {integrity: sha512-etOGyfiDFQz/1WJnD3jFL2N7ykujTjiudAz6qZTz82xE5oabKuKX+Cn8SdM9dOwzyWmBUKbUdll8QhovAXjn+g==} - '@push.rocks/smartsocket@3.0.0': - resolution: {integrity: sha512-8pUbOybNBwXF+D9VsuC+3LjD+r9uRzcgcwFRcpic6WGVqW0c5hI8D8YwKDHkL11XJJD7yNRJnsoIc618EVUvuQ==} - '@push.rocks/smartspawn@3.0.3': resolution: {integrity: sha512-DyrGPV69wwOiJgKkyruk5hS3UEGZ99xFAqBE9O2nM8VXCRLbbty3xt1Ug5Z092ZZmJYaaGMSnMw3ijyZJFCT0Q==} @@ -1507,8 +1498,8 @@ packages: resolution: {integrity: sha512-6gnIz3h+PEPQGDj8MnRSjDvKBah042jEoPgjFGJ4iJLBE78L4lY/n98x14XyPF4u3lN179Ub/ZKFY5za9GeLQw==} engines: {node: '>=18.0.0'} - '@smithy/core@3.18.6': - resolution: {integrity: sha512-8Q/ugWqfDUEU1Exw71+DoOzlONJ2Cn9QA8VeeDzLLjzO/qruh9UKFzbszy4jXcIYgGofxYiT0t1TT6+CT/GupQ==} + '@smithy/core@3.18.7': + resolution: {integrity: sha512-axG9MvKhMWOhFbvf5y2DuyTxQueO0dkedY9QC3mAfndLosRI/9LJv8WaL0mw7ubNhsO4IuXX9/9dYGPFvHrqlw==} engines: {node: '>=18.0.0'} '@smithy/credential-provider-imds@4.2.5': @@ -1575,16 +1566,16 @@ packages: resolution: {integrity: sha512-9pAX/H+VQPzNbouhDhkW723igBMLgrI8OtX+++M7iKJgg/zY/Ig3i1e6seCcx22FWhE6Q/S61BRdi2wXBORT+A==} engines: {node: '>=18.0.0'} - '@smithy/middleware-endpoint@4.3.13': - resolution: {integrity: sha512-X4za1qCdyx1hEVVXuAWlZuK6wzLDv1uw1OY9VtaYy1lULl661+frY7FeuHdYdl7qAARUxH2yvNExU2/SmRFfcg==} + '@smithy/middleware-endpoint@4.3.14': + resolution: {integrity: sha512-v0q4uTKgBM8dsqGjqsabZQyH85nFaTnFcgpWU1uydKFsdyyMzfvOkNum9G7VK+dOP01vUnoZxIeRiJ6uD0kjIg==} engines: {node: '>=18.0.0'} '@smithy/middleware-retry@4.4.12': resolution: {integrity: sha512-S4kWNKFowYd0lID7/DBqWHOQxmxlsf0jBaos9chQZUWTVOjSW1Ogyh8/ib5tM+agFDJ/TCxuCTvrnlc+9cIBcQ==} engines: {node: '>=18.0.0'} - '@smithy/middleware-retry@4.4.13': - resolution: {integrity: sha512-RzIDF9OrSviXX7MQeKOm8r/372KTyY8Jmp6HNKOOYlrguHADuM3ED/f4aCyNhZZFLG55lv5beBin7nL0Nzy1Dw==} + '@smithy/middleware-retry@4.4.14': + resolution: {integrity: sha512-Z2DG8Ej7FyWG1UA+7HceINtSLzswUgs2np3sZX0YBBxCt+CXG4QUxv88ZDS3+2/1ldW7LqtSY1UO/6VQ1pND8Q==} engines: {node: '>=18.0.0'} '@smithy/middleware-serde@4.2.6': @@ -1631,12 +1622,12 @@ packages: resolution: {integrity: sha512-xSUfMu1FT7ccfSXkoLl/QRQBi2rOvi3tiBZU2Tdy3I6cgvZ6SEi9QNey+lqps/sJRnogIS+lq+B1gxxbra2a/w==} engines: {node: '>=18.0.0'} - '@smithy/smithy-client@4.9.8': - resolution: {integrity: sha512-8xgq3LgKDEFoIrLWBho/oYKyWByw9/corz7vuh1upv7ZBm0ZMjGYBhbn6v643WoIqA9UTcx5A5htEp/YatUwMA==} + '@smithy/smithy-client@4.9.10': + resolution: {integrity: sha512-Jaoz4Jw1QYHc1EFww/E6gVtNjhoDU+gwRKqXP6C3LKYqqH2UQhP8tMP3+t/ePrhaze7fhLE8vS2q6vVxBANFTQ==} engines: {node: '>=18.0.0'} - '@smithy/smithy-client@4.9.9': - resolution: {integrity: sha512-SUnZJMMo5yCmgjopJbiNeo1vlr8KvdnEfIHV9rlD77QuOGdRotIVBcOrBuMr+sI9zrnhtDtLP054bZVbpZpiQA==} + '@smithy/smithy-client@4.9.8': + resolution: {integrity: sha512-8xgq3LgKDEFoIrLWBho/oYKyWByw9/corz7vuh1upv7ZBm0ZMjGYBhbn6v643WoIqA9UTcx5A5htEp/YatUwMA==} engines: {node: '>=18.0.0'} '@smithy/types@4.9.0': @@ -1675,16 +1666,16 @@ packages: resolution: {integrity: sha512-yHv+r6wSQXEXTPVCIQTNmXVWs7ekBTpMVErjqZoWkYN75HIFN5y9+/+sYOejfAuvxWGvgzgxbTHa/oz61YTbKw==} engines: {node: '>=18.0.0'} - '@smithy/util-defaults-mode-browser@4.3.12': - resolution: {integrity: sha512-TKc6FnOxFULKxLgTNHYjcFqdOYzXVPFFVm5JhI30F3RdhT7nYOtOsjgaOwfDRmA/3U66O9KaBQ3UHoXwayRhAg==} + '@smithy/util-defaults-mode-browser@4.3.13': + resolution: {integrity: sha512-hlVLdAGrVfyNei+pKIgqDTxfu/ZI2NSyqj4IDxKd5bIsIqwR/dSlkxlPaYxFiIaDVrBy0he8orsFy+Cz119XvA==} engines: {node: '>=18.0.0'} '@smithy/util-defaults-mode-node@4.2.14': resolution: {integrity: sha512-ljZN3iRvaJUgulfvobIuG97q1iUuCMrvXAlkZ4msY+ZuVHQHDIqn7FKZCEj+bx8omz6kF5yQXms/xhzjIO5XiA==} engines: {node: '>=18.0.0'} - '@smithy/util-defaults-mode-node@4.2.15': - resolution: {integrity: sha512-94NqfQVo+vGc5gsQ9SROZqOvBkGNMQu6pjXbnn8aQvBUhc31kx49gxlkBEqgmaZQHUUfdRUin5gK/HlHKmbAwg==} + '@smithy/util-defaults-mode-node@4.2.16': + resolution: {integrity: sha512-F1t22IUiJLHrxW9W1CQ6B9PN+skZ9cqSuzB18Eh06HrJPbjsyZ7ZHecAKw80DQtyGTRcVfeukKaCRYebFwclbg==} engines: {node: '>=18.0.0'} '@smithy/util-endpoints@3.2.5': @@ -2761,6 +2752,9 @@ packages: js-base64@3.7.7: resolution: {integrity: sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==} + js-base64@3.7.8: + resolution: {integrity: sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow==} + js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -3615,6 +3609,10 @@ packages: resolution: {integrity: sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==} engines: {node: '>=12'} + strip-indent@4.1.1: + resolution: {integrity: sha512-SlyRoSkdh1dYP0PzclLE7r0M9sgbFKKMFXpFRUMNuKhQSbC6VQIGzq3E0qsfvGJaUFJPGv6Ws1NZ/haTAjfbMA==} + engines: {node: '>=12'} + strip-json-comments@2.0.1: resolution: {integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo=} engines: {node: '>=0.10.0'} @@ -3788,6 +3786,10 @@ packages: url@0.11.3: resolution: {integrity: sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==} + url@0.11.4: + resolution: {integrity: sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==} + engines: {node: '>= 0.4'} + util-deprecate@1.0.2: resolution: {integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=} @@ -3909,23 +3911,23 @@ snapshots: '@api.global/typedrequest-interfaces@3.0.19': {} - '@api.global/typedrequest@3.1.10': + '@api.global/typedrequest@3.1.11': dependencies: '@api.global/typedrequest-interfaces': 3.0.19 '@push.rocks/isounique': 1.0.5 '@push.rocks/lik': 6.2.2 - '@push.rocks/smartbuffer': 3.0.4 + '@push.rocks/smartbuffer': 3.0.5 '@push.rocks/smartdelay': 3.0.5 '@push.rocks/smartguard': 3.1.0 '@push.rocks/smartpromise': 4.2.3 '@push.rocks/webrequest': 3.0.37 '@push.rocks/webstream': 1.0.10 - '@api.global/typedserver@3.0.80(@push.rocks/smartserve@1.1.0)': + '@api.global/typedserver@3.0.80(@push.rocks/smartserve@1.1.2)': dependencies: - '@api.global/typedrequest': 3.1.10 + '@api.global/typedrequest': 3.1.11 '@api.global/typedrequest-interfaces': 3.0.19 - '@api.global/typedsocket': 3.1.1(@push.rocks/smartserve@1.1.0) + '@api.global/typedsocket': 3.1.1(@push.rocks/smartserve@1.1.2) '@cloudflare/workers-types': 4.20251202.0 '@design.estate/dees-comms': 1.0.27 '@push.rocks/lik': 6.2.2 @@ -3969,9 +3971,9 @@ snapshots: - utf-8-validate - vue - '@api.global/typedsocket@3.1.1(@push.rocks/smartserve@1.1.0)': + '@api.global/typedsocket@3.1.1(@push.rocks/smartserve@1.1.2)': dependencies: - '@api.global/typedrequest': 3.1.10 + '@api.global/typedrequest': 3.1.11 '@api.global/typedrequest-interfaces': 3.0.19 '@push.rocks/isohash': 2.0.1 '@push.rocks/smartjson': 5.2.0 @@ -3980,7 +3982,7 @@ snapshots: '@push.rocks/smartstring': 4.1.0 '@push.rocks/smarturl': 3.1.0 optionalDependencies: - '@push.rocks/smartserve': 1.1.0 + '@push.rocks/smartserve': 1.1.2 transitivePeerDependencies: - '@nuxt/kit' - bufferutil @@ -3989,21 +3991,18 @@ snapshots: - utf-8-validate - vue - '@api.global/typedsocket@4.0.0(@push.rocks/smartserve@1.1.0)': + '@api.global/typedsocket@4.1.0(@push.rocks/smartserve@1.1.2)': dependencies: - '@api.global/typedrequest': 3.1.10 + '@api.global/typedrequest': 3.1.11 '@api.global/typedrequest-interfaces': 3.0.19 '@push.rocks/isohash': 2.0.1 + '@push.rocks/smartdelay': 3.0.5 '@push.rocks/smartjson': 5.2.0 + '@push.rocks/smartpromise': 4.2.3 '@push.rocks/smartrx': 3.0.10 - '@push.rocks/smartsocket': 3.0.0 + '@push.rocks/smartserve': 1.1.2 '@push.rocks/smartstring': 4.1.0 '@push.rocks/smarturl': 3.1.0 - optionalDependencies: - '@push.rocks/smartserve': 1.1.0 - transitivePeerDependencies: - - bufferutil - - utf-8-validate '@aws-crypto/crc32@5.2.0': dependencies: @@ -4068,26 +4067,26 @@ snapshots: '@aws-sdk/util-user-agent-browser': 3.775.0 '@aws-sdk/util-user-agent-node': 3.787.0 '@smithy/config-resolver': 4.4.3 - '@smithy/core': 3.18.6 + '@smithy/core': 3.18.7 '@smithy/fetch-http-handler': 5.3.6 '@smithy/hash-node': 4.2.5 '@smithy/invalid-dependency': 4.2.5 '@smithy/middleware-content-length': 4.2.5 - '@smithy/middleware-endpoint': 4.3.13 - '@smithy/middleware-retry': 4.4.13 + '@smithy/middleware-endpoint': 4.3.14 + '@smithy/middleware-retry': 4.4.14 '@smithy/middleware-serde': 4.2.6 '@smithy/middleware-stack': 4.2.5 '@smithy/node-config-provider': 4.3.5 '@smithy/node-http-handler': 4.4.5 '@smithy/protocol-http': 5.3.5 - '@smithy/smithy-client': 4.9.9 + '@smithy/smithy-client': 4.9.10 '@smithy/types': 4.9.0 '@smithy/url-parser': 4.2.5 '@smithy/util-base64': 4.3.0 '@smithy/util-body-length-browser': 4.2.0 '@smithy/util-body-length-node': 4.2.1 - '@smithy/util-defaults-mode-browser': 4.3.12 - '@smithy/util-defaults-mode-node': 4.2.15 + '@smithy/util-defaults-mode-browser': 4.3.13 + '@smithy/util-defaults-mode-node': 4.2.16 '@smithy/util-endpoints': 3.2.5 '@smithy/util-middleware': 4.2.5 '@smithy/util-retry': 4.2.5 @@ -4232,26 +4231,26 @@ snapshots: '@aws-sdk/util-user-agent-browser': 3.775.0 '@aws-sdk/util-user-agent-node': 3.787.0 '@smithy/config-resolver': 4.4.3 - '@smithy/core': 3.18.6 + '@smithy/core': 3.18.7 '@smithy/fetch-http-handler': 5.3.6 '@smithy/hash-node': 4.2.5 '@smithy/invalid-dependency': 4.2.5 '@smithy/middleware-content-length': 4.2.5 - '@smithy/middleware-endpoint': 4.3.13 - '@smithy/middleware-retry': 4.4.13 + '@smithy/middleware-endpoint': 4.3.14 + '@smithy/middleware-retry': 4.4.14 '@smithy/middleware-serde': 4.2.6 '@smithy/middleware-stack': 4.2.5 '@smithy/node-config-provider': 4.3.5 '@smithy/node-http-handler': 4.4.5 '@smithy/protocol-http': 5.3.5 - '@smithy/smithy-client': 4.9.9 + '@smithy/smithy-client': 4.9.10 '@smithy/types': 4.9.0 '@smithy/url-parser': 4.2.5 '@smithy/util-base64': 4.3.0 '@smithy/util-body-length-browser': 4.2.0 '@smithy/util-body-length-node': 4.2.1 - '@smithy/util-defaults-mode-browser': 4.3.12 - '@smithy/util-defaults-mode-node': 4.2.15 + '@smithy/util-defaults-mode-browser': 4.3.13 + '@smithy/util-defaults-mode-node': 4.2.16 '@smithy/util-endpoints': 3.2.5 '@smithy/util-middleware': 4.2.5 '@smithy/util-retry': 4.2.5 @@ -4350,12 +4349,12 @@ snapshots: '@aws-sdk/core@3.775.0': dependencies: '@aws-sdk/types': 3.775.0 - '@smithy/core': 3.18.6 + '@smithy/core': 3.18.7 '@smithy/node-config-provider': 4.3.5 '@smithy/property-provider': 4.2.5 '@smithy/protocol-http': 5.3.5 '@smithy/signature-v4': 5.3.5 - '@smithy/smithy-client': 4.9.9 + '@smithy/smithy-client': 4.9.10 '@smithy/types': 4.9.0 '@smithy/util-middleware': 4.2.5 fast-xml-parser: 4.4.1 @@ -4438,7 +4437,7 @@ snapshots: '@smithy/node-http-handler': 4.4.5 '@smithy/property-provider': 4.2.5 '@smithy/protocol-http': 5.3.5 - '@smithy/smithy-client': 4.9.9 + '@smithy/smithy-client': 4.9.10 '@smithy/types': 4.9.0 '@smithy/util-stream': 4.5.6 tslib: 2.8.1 @@ -4710,7 +4709,7 @@ snapshots: '@aws-sdk/nested-clients': 3.787.0 '@aws-sdk/types': 3.775.0 '@smithy/config-resolver': 4.4.3 - '@smithy/core': 3.18.6 + '@smithy/core': 3.18.7 '@smithy/credential-provider-imds': 4.2.5 '@smithy/node-config-provider': 4.3.5 '@smithy/property-provider': 4.2.5 @@ -4914,7 +4913,7 @@ snapshots: '@aws-sdk/core': 3.775.0 '@aws-sdk/types': 3.775.0 '@aws-sdk/util-endpoints': 3.787.0 - '@smithy/core': 3.18.6 + '@smithy/core': 3.18.7 '@smithy/protocol-http': 5.3.5 '@smithy/types': 4.9.0 tslib: 2.8.1 @@ -4955,26 +4954,26 @@ snapshots: '@aws-sdk/util-user-agent-browser': 3.775.0 '@aws-sdk/util-user-agent-node': 3.787.0 '@smithy/config-resolver': 4.4.3 - '@smithy/core': 3.18.6 + '@smithy/core': 3.18.7 '@smithy/fetch-http-handler': 5.3.6 '@smithy/hash-node': 4.2.5 '@smithy/invalid-dependency': 4.2.5 '@smithy/middleware-content-length': 4.2.5 - '@smithy/middleware-endpoint': 4.3.13 - '@smithy/middleware-retry': 4.4.13 + '@smithy/middleware-endpoint': 4.3.14 + '@smithy/middleware-retry': 4.4.14 '@smithy/middleware-serde': 4.2.6 '@smithy/middleware-stack': 4.2.5 '@smithy/node-config-provider': 4.3.5 '@smithy/node-http-handler': 4.4.5 '@smithy/protocol-http': 5.3.5 - '@smithy/smithy-client': 4.9.9 + '@smithy/smithy-client': 4.9.10 '@smithy/types': 4.9.0 '@smithy/url-parser': 4.2.5 '@smithy/util-base64': 4.3.0 '@smithy/util-body-length-browser': 4.2.0 '@smithy/util-body-length-node': 4.2.1 - '@smithy/util-defaults-mode-browser': 4.3.12 - '@smithy/util-defaults-mode-node': 4.2.15 + '@smithy/util-defaults-mode-browser': 4.3.13 + '@smithy/util-defaults-mode-node': 4.2.16 '@smithy/util-endpoints': 3.2.5 '@smithy/util-middleware': 4.2.5 '@smithy/util-retry': 4.2.5 @@ -5275,14 +5274,14 @@ snapshots: '@design.estate/dees-comms@1.0.27': dependencies: - '@api.global/typedrequest': 3.1.10 + '@api.global/typedrequest': 3.1.11 '@api.global/typedrequest-interfaces': 3.0.19 '@push.rocks/smartdelay': 3.0.5 broadcast-channel: 7.0.0 '@design.estate/dees-domtools@2.0.65': dependencies: - '@api.global/typedrequest': 3.1.10 + '@api.global/typedrequest': 3.1.11 '@design.estate/dees-comms': 1.0.27 '@push.rocks/lik': 6.2.2 '@push.rocks/smartdelay': 3.0.5 @@ -5304,7 +5303,7 @@ snapshots: '@design.estate/dees-domtools@2.3.6': dependencies: - '@api.global/typedrequest': 3.1.10 + '@api.global/typedrequest': 3.1.11 '@design.estate/dees-comms': 1.0.27 '@push.rocks/lik': 6.2.2 '@push.rocks/smartdelay': 3.0.5 @@ -5588,9 +5587,9 @@ snapshots: '@push.rocks/smartshell': 3.3.0 tsx: 4.20.6 - '@git.zone/tstest@3.1.3(@aws-sdk/credential-providers@3.787.0)(@push.rocks/smartserve@1.1.0)(socks@2.8.7)(typescript@5.9.3)': + '@git.zone/tstest@3.1.3(@aws-sdk/credential-providers@3.787.0)(@push.rocks/smartserve@1.1.2)(socks@2.8.7)(typescript@5.9.3)': dependencies: - '@api.global/typedserver': 3.0.80(@push.rocks/smartserve@1.1.0) + '@api.global/typedserver': 3.0.80(@push.rocks/smartserve@1.1.2) '@git.zone/tsbundle': 2.6.3 '@git.zone/tsrun': 2.0.0 '@push.rocks/consolecolor': 2.0.3 @@ -5905,7 +5904,7 @@ snapshots: '@push.rocks/qenv@6.1.3': dependencies: - '@api.global/typedrequest': 3.1.10 + '@api.global/typedrequest': 3.1.11 '@configvault.io/interfaces': 1.0.17 '@push.rocks/smartfile': 11.2.7 '@push.rocks/smartlog': 3.1.10 @@ -5976,10 +5975,6 @@ snapshots: transitivePeerDependencies: - aws-crt - '@push.rocks/smartbuffer@3.0.4': - dependencies: - uint8array-extras: 1.4.0 - '@push.rocks/smartbuffer@3.0.5': dependencies: uint8array-extras: 1.5.0 @@ -6394,13 +6389,17 @@ snapshots: transitivePeerDependencies: - aws-crt - '@push.rocks/smartserve@1.1.0': + '@push.rocks/smartserve@1.1.2': dependencies: - '@api.global/typedrequest': 3.1.10 + '@api.global/typedrequest': 3.1.11 '@push.rocks/lik': 6.2.2 '@push.rocks/smartenv': 6.0.0 '@push.rocks/smartlog': 3.1.10 '@push.rocks/smartpath': 6.0.0 + ws: 8.18.3 + transitivePeerDependencies: + - bufferutil + - utf-8-validate '@push.rocks/smartshell@3.3.0': dependencies: @@ -6423,7 +6422,7 @@ snapshots: '@push.rocks/smartsocket@2.1.0': dependencies: '@api.global/typedrequest-interfaces': 3.0.19 - '@api.global/typedserver': 3.0.80(@push.rocks/smartserve@1.1.0) + '@api.global/typedserver': 3.0.80(@push.rocks/smartserve@1.1.2) '@push.rocks/isohash': 2.0.1 '@push.rocks/isounique': 1.0.5 '@push.rocks/lik': 6.2.2 @@ -6445,24 +6444,6 @@ snapshots: - utf-8-validate - vue - '@push.rocks/smartsocket@3.0.0': - dependencies: - '@api.global/typedrequest-interfaces': 3.0.19 - '@push.rocks/isohash': 2.0.1 - '@push.rocks/isounique': 1.0.5 - '@push.rocks/lik': 6.2.2 - '@push.rocks/smartdelay': 3.0.5 - '@push.rocks/smartenv': 6.0.0 - '@push.rocks/smartjson': 5.2.0 - '@push.rocks/smartlog': 3.1.10 - '@push.rocks/smartpromise': 4.2.3 - '@push.rocks/smartrx': 3.0.10 - '@push.rocks/smarttime': 4.1.1 - ws: 8.18.3 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - '@push.rocks/smartspawn@3.0.3': dependencies: '@push.rocks/smartpromise': 4.2.3 @@ -6646,11 +6627,11 @@ snapshots: '@types/randomatic': 3.1.5 buffer: 6.0.3 crypto-random-string: 5.0.0 - js-base64: 3.7.7 + js-base64: 3.7.8 normalize-newline: 4.1.0 randomatic: 3.1.1 - strip-indent: 4.0.0 - url: 0.11.3 + strip-indent: 4.1.1 + url: 0.11.4 '@rolldown/binding-android-arm64@1.0.0-beta.52': optional: true @@ -6791,7 +6772,7 @@ snapshots: '@smithy/uuid': 1.1.0 tslib: 2.8.1 - '@smithy/core@3.18.6': + '@smithy/core@3.18.7': dependencies: '@smithy/middleware-serde': 4.2.6 '@smithy/protocol-http': 5.3.5 @@ -6907,9 +6888,9 @@ snapshots: '@smithy/util-middleware': 4.2.5 tslib: 2.8.1 - '@smithy/middleware-endpoint@4.3.13': + '@smithy/middleware-endpoint@4.3.14': dependencies: - '@smithy/core': 3.18.6 + '@smithy/core': 3.18.7 '@smithy/middleware-serde': 4.2.6 '@smithy/node-config-provider': 4.3.5 '@smithy/shared-ini-file-loader': 4.4.0 @@ -6931,12 +6912,12 @@ snapshots: '@smithy/uuid': 1.1.0 tslib: 2.8.1 - '@smithy/middleware-retry@4.4.13': + '@smithy/middleware-retry@4.4.14': dependencies: '@smithy/node-config-provider': 4.3.5 '@smithy/protocol-http': 5.3.5 '@smithy/service-error-classification': 4.2.5 - '@smithy/smithy-client': 4.9.9 + '@smithy/smithy-client': 4.9.10 '@smithy/types': 4.9.0 '@smithy/util-middleware': 4.2.5 '@smithy/util-retry': 4.2.5 @@ -7011,6 +6992,17 @@ snapshots: '@smithy/util-utf8': 4.2.0 tslib: 2.8.1 + '@smithy/smithy-client@4.9.10': + dependencies: + '@smithy/core': 3.18.7 + '@smithy/middleware-endpoint': 4.3.14 + '@smithy/middleware-stack': 4.2.5 + '@smithy/protocol-http': 5.3.5 + '@smithy/types': 4.9.0 + '@smithy/util-stream': 4.5.6 + tslib: 2.8.1 + optional: true + '@smithy/smithy-client@4.9.8': dependencies: '@smithy/core': 3.18.5 @@ -7021,17 +7013,6 @@ snapshots: '@smithy/util-stream': 4.5.6 tslib: 2.8.1 - '@smithy/smithy-client@4.9.9': - dependencies: - '@smithy/core': 3.18.6 - '@smithy/middleware-endpoint': 4.3.13 - '@smithy/middleware-stack': 4.2.5 - '@smithy/protocol-http': 5.3.5 - '@smithy/types': 4.9.0 - '@smithy/util-stream': 4.5.6 - tslib: 2.8.1 - optional: true - '@smithy/types@4.9.0': dependencies: tslib: 2.8.1 @@ -7077,10 +7058,10 @@ snapshots: '@smithy/types': 4.9.0 tslib: 2.8.1 - '@smithy/util-defaults-mode-browser@4.3.12': + '@smithy/util-defaults-mode-browser@4.3.13': dependencies: '@smithy/property-provider': 4.2.5 - '@smithy/smithy-client': 4.9.9 + '@smithy/smithy-client': 4.9.10 '@smithy/types': 4.9.0 tslib: 2.8.1 optional: true @@ -7095,13 +7076,13 @@ snapshots: '@smithy/types': 4.9.0 tslib: 2.8.1 - '@smithy/util-defaults-mode-node@4.2.15': + '@smithy/util-defaults-mode-node@4.2.16': dependencies: '@smithy/config-resolver': 4.4.3 '@smithy/credential-provider-imds': 4.2.5 '@smithy/node-config-provider': 4.3.5 '@smithy/property-provider': 4.2.5 - '@smithy/smithy-client': 4.9.9 + '@smithy/smithy-client': 4.9.10 '@smithy/types': 4.9.0 tslib: 2.8.1 optional: true @@ -8337,6 +8318,8 @@ snapshots: js-base64@3.7.7: {} + js-base64@3.7.8: {} + js-tokens@4.0.0: {} js-yaml@3.14.1: @@ -9472,6 +9455,8 @@ snapshots: dependencies: min-indent: 1.0.1 + strip-indent@4.1.1: {} + strip-json-comments@2.0.1: {} strnum@1.1.2: {} @@ -9655,6 +9640,11 @@ snapshots: punycode: 1.4.1 qs: 6.14.0 + url@0.11.4: + dependencies: + punycode: 1.4.1 + qs: 6.14.0 + util-deprecate@1.0.2: {} uuid@9.0.1: {} diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index b5d2551..6137611 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@api.global/typedserver', - version: '6.0.0', + version: '6.0.1', description: 'A TypeScript-based project for easy serving of static files with support for live reloading, compression, and typed requests.' } diff --git a/ts_web_inject/index.ts b/ts_web_inject/index.ts index 2c6b35f..f547dcf 100644 --- a/ts_web_inject/index.ts +++ b/ts_web_inject/index.ts @@ -102,17 +102,13 @@ export class ReloadChecker { this.typedrouter, plugins.typedsocket.TypedSocket.useWindowLocationOriginUrl() ); - this.typedsocket.addTag('typedserver_frontend', {}); - this.typedsocket.eventSubject.subscribe(async (eventArg) => { - console.log(`typedsocket event subscription: ${eventArg}`); - if ( - eventArg === 'disconnected' || - eventArg === 'disconnecting' || - eventArg === 'timedOut' - ) { + await this.typedsocket.setTag('typedserver_frontend', {}); + this.typedsocket.statusSubject.subscribe(async (statusArg) => { + console.log(`typedsocket status: ${statusArg}`); + if (statusArg === 'disconnected' || statusArg === 'reconnecting') { this.backendConnectionLost = true; - this.infoscreen.setText(`typedsocket ${eventArg}!`); - } else if (eventArg === 'connected' && this.backendConnectionLost) { + this.infoscreen.setText(`typedsocket ${statusArg}!`); + } else if (statusArg === 'connected' && this.backendConnectionLost) { this.backendConnectionLost = false; this.infoscreen.setSuccess('typedsocket connected!'); // lets check if a reload is necessary