This commit is contained in:
xion 2024-11-29 01:46:00 +08:00
parent b67bc5d124
commit eba5e4988e
4 changed files with 60 additions and 97 deletions

@ -1 +1 @@
Subproject commit 73118f845456d18a22dc652fbf240d4b955c4fc5 Subproject commit 5c91ac8b8d503a241abbb1bb58cc46c0b5e6ffc4

136
pnpm-lock.yaml generated
View File

@ -136,7 +136,7 @@ importers:
version: 15.3.0(rollup@4.27.4) version: 15.3.0(rollup@4.27.4)
'@rollup/plugin-typescript': '@rollup/plugin-typescript':
specifier: ^12.1.1 specifier: ^12.1.1
version: 12.1.1(rollup@4.27.4)(tslib@2.7.0)(typescript@5.7.2) version: 12.1.1(rollup@4.27.4)(tslib@2.8.1)(typescript@5.7.2)
'@types/archiver': '@types/archiver':
specifier: ^6.0.3 specifier: ^6.0.3
version: 6.0.3 version: 6.0.3
@ -248,7 +248,7 @@ importers:
version: 15.3.0(rollup@4.27.2) version: 15.3.0(rollup@4.27.2)
'@rollup/plugin-typescript': '@rollup/plugin-typescript':
specifier: ^12.1.0 specifier: ^12.1.0
version: 12.1.1(rollup@4.27.2)(tslib@2.7.0)(typescript@5.7.2) version: 12.1.1(rollup@4.27.2)(tslib@2.8.1)(typescript@5.7.2)
'@types/node': '@types/node':
specifier: ^22.7.2 specifier: ^22.7.2
version: 22.9.0 version: 22.9.0
@ -261,40 +261,40 @@ importers:
packages/var-proxy: packages/var-proxy:
dependencies: dependencies:
'@abearxiong/router':
specifier: 0.0.1-alpha.43
version: 0.0.1-alpha.43
'@abearxiong/use-config':
specifier: ^0.0.2
version: 0.0.2
'@abearxiong/use-file-store': '@abearxiong/use-file-store':
specifier: ^0.0.1 specifier: ^0.0.1
version: 0.0.1(esbuild@0.23.1)(typescript@5.6.3) version: 0.0.1(esbuild@0.23.1)(typescript@5.7.2)
'@kevisual/router':
specifier: 0.0.6-alpha-2
version: 0.0.6-alpha-2
'@kevisual/use-config':
specifier: ^1.0.3
version: 1.0.3
ioredis: ioredis:
specifier: ^5.4.1 specifier: ^5.4.1
version: 5.4.1 version: 5.4.1
nanoid: nanoid:
specifier: ^5.0.7 specifier: ^5.0.9
version: 5.0.8 version: 5.0.9
devDependencies: devDependencies:
'@rollup/plugin-commonjs': '@rollup/plugin-commonjs':
specifier: ^28.0.0 specifier: ^28.0.1
version: 28.0.1(rollup@4.27.2) version: 28.0.1(rollup@4.27.4)
'@rollup/plugin-json': '@rollup/plugin-json':
specifier: ^6.1.0 specifier: ^6.1.0
version: 6.1.0(rollup@4.27.2) version: 6.1.0(rollup@4.27.4)
'@rollup/plugin-node-resolve': '@rollup/plugin-node-resolve':
specifier: ^15.3.0 specifier: ^15.3.0
version: 15.3.0(rollup@4.27.2) version: 15.3.0(rollup@4.27.4)
'@rollup/plugin-typescript': '@rollup/plugin-typescript':
specifier: ^12.1.0 specifier: ^12.1.1
version: 12.1.1(rollup@4.27.2)(tslib@2.7.0)(typescript@5.6.3) version: 12.1.1(rollup@4.27.4)(tslib@2.8.1)(typescript@5.7.2)
'@types/http-proxy': '@types/http-proxy':
specifier: ^1.17.15 specifier: ^1.17.15
version: 1.17.15 version: 1.17.15
'@types/node': '@types/node':
specifier: ^22.7.5 specifier: ^22.10.1
version: 22.9.0 version: 22.10.1
cross-env: cross-env:
specifier: ^7.0.3 specifier: ^7.0.3
version: 7.0.3 version: 7.0.3
@ -302,26 +302,20 @@ importers:
specifier: ^3.1.7 specifier: ^3.1.7
version: 3.1.7 version: 3.1.7
rollup: rollup:
specifier: ^4.24.0 specifier: ^4.27.4
version: 4.27.2 version: 4.27.4
ts-lib:
specifier: ^0.0.5
version: 0.0.5
tslib: tslib:
specifier: ^2.7.0 specifier: ^2.8.1
version: 2.7.0 version: 2.8.1
typescript: typescript:
specifier: ^5.6.3 specifier: ^5.7.2
version: 5.6.3 version: 5.7.2
packages: packages:
'@abearxiong/router@0.0.1-alpha.36': '@abearxiong/router@0.0.1-alpha.36':
resolution: {integrity: sha512-rpxel/upIeJEsRYHXqAOezAooPvXFjuWeA28oB/KClrP8B9WY8grlmHQUkvtsGtXypOCqcYoxZ9Nb9awJlzN5A==, tarball: https://npm.pkg.github.com/download/@abearxiong/router/0.0.1-alpha.36/c4e3c3f88da8e6b1217450ab3713c600efcb5504} resolution: {integrity: sha512-rpxel/upIeJEsRYHXqAOezAooPvXFjuWeA28oB/KClrP8B9WY8grlmHQUkvtsGtXypOCqcYoxZ9Nb9awJlzN5A==, tarball: https://npm.pkg.github.com/download/@abearxiong/router/0.0.1-alpha.36/c4e3c3f88da8e6b1217450ab3713c600efcb5504}
'@abearxiong/router@0.0.1-alpha.43':
resolution: {integrity: sha512-umwi4T5s54Zb8ItseGw3uB7PDG8BqnHyAughlXH2dhub4f49fO+rwR+Zth7scUONkmc21Z27/lPgLBHXrYOkYw==, tarball: https://npm.pkg.github.com/download/@abearxiong/router/0.0.1-alpha.43/287c6e2597b36c5e3ed351b473e38f468b5f49ea}
'@abearxiong/use-config@0.0.2': '@abearxiong/use-config@0.0.2':
resolution: {integrity: sha512-IBOmeP46ykbDlkplFS65UsAHjyPDKnvS2oqbkpLWhbSwDbF5zhBnD4ibsFZKPCyc3lMlPeRqYva4x6puX3E/qQ==, tarball: https://npm.pkg.github.com/download/@abearxiong/use-config/0.0.2/59fbeec8c8e086ec48e55024fe39020b079e6fa5} resolution: {integrity: sha512-IBOmeP46ykbDlkplFS65UsAHjyPDKnvS2oqbkpLWhbSwDbF5zhBnD4ibsFZKPCyc3lMlPeRqYva4x6puX3E/qQ==, tarball: https://npm.pkg.github.com/download/@abearxiong/use-config/0.0.2/59fbeec8c8e086ec48e55024fe39020b079e6fa5}
@ -1056,6 +1050,9 @@ packages:
'@kevisual/router@0.0.5': '@kevisual/router@0.0.5':
resolution: {integrity: sha512-ALDsOrKwgxKWwwrnWgrcYoCPPSX0D6aU4P784HQslkLMRoQQ4xgsGr95BW+Wk9LeesXWsUhEpDW3QjUSzYoPlA==} resolution: {integrity: sha512-ALDsOrKwgxKWwwrnWgrcYoCPPSX0D6aU4P784HQslkLMRoQQ4xgsGr95BW+Wk9LeesXWsUhEpDW3QjUSzYoPlA==}
'@kevisual/router@0.0.6-alpha-2':
resolution: {integrity: sha512-P9rarSQG0tp8L3GSgivYZQ//SugEt6/YCzNE8087KsRIdF1g0v8rXGfi1G3b8cXRz/ip79Lb+caU7LsoAQhmOQ==}
'@kevisual/use-config@1.0.3': '@kevisual/use-config@1.0.3':
resolution: {integrity: sha512-pACKQP6488CMUT7685NJCkrzItQaIWC2gOSq3+a7gHfLpIjgTiGWLZoE8OozJCFf7HYsCYgYpsx5EgWv553nrg==} resolution: {integrity: sha512-pACKQP6488CMUT7685NJCkrzItQaIWC2gOSq3+a7gHfLpIjgTiGWLZoE8OozJCFf7HYsCYgYpsx5EgWv553nrg==}
@ -3885,6 +3882,9 @@ packages:
tslib@2.7.0: tslib@2.7.0:
resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==} resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==}
tslib@2.8.1:
resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
tsx@4.19.2: tsx@4.19.2:
resolution: {integrity: sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g==} resolution: {integrity: sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g==}
engines: {node: '>=18.0.0'} engines: {node: '>=18.0.0'}
@ -3916,11 +3916,6 @@ packages:
resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==} resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
engines: {node: '>= 0.4'} engines: {node: '>= 0.4'}
typescript@5.6.3:
resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==}
engines: {node: '>=14.17'}
hasBin: true
typescript@5.7.2: typescript@5.7.2:
resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==} resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==}
engines: {node: '>=14.17'} engines: {node: '>=14.17'}
@ -4189,27 +4184,8 @@ snapshots:
- bufferutil - bufferutil
- utf-8-validate - utf-8-validate
'@abearxiong/router@0.0.1-alpha.43':
dependencies:
ws: 8.18.0
transitivePeerDependencies:
- bufferutil
- utf-8-validate
'@abearxiong/use-config@0.0.2': {} '@abearxiong/use-config@0.0.2': {}
'@abearxiong/use-file-store@0.0.1(esbuild@0.23.1)(typescript@5.6.3)':
dependencies:
json5: 2.2.3
ts-loader: 9.5.1(typescript@5.6.3)(webpack@5.96.1(esbuild@0.23.1))
webpack: 5.96.1(esbuild@0.23.1)
transitivePeerDependencies:
- '@swc/core'
- esbuild
- typescript
- uglify-js
- webpack-cli
'@abearxiong/use-file-store@0.0.1(esbuild@0.23.1)(typescript@5.7.2)': '@abearxiong/use-file-store@0.0.1(esbuild@0.23.1)(typescript@5.7.2)':
dependencies: dependencies:
json5: 2.2.3 json5: 2.2.3
@ -5058,6 +5034,15 @@ snapshots:
- bufferutil - bufferutil
- utf-8-validate - utf-8-validate
'@kevisual/router@0.0.6-alpha-2':
dependencies:
path-to-regexp: 8.2.0
selfsigned: 2.4.1
ws: 8.18.0
transitivePeerDependencies:
- bufferutil
- utf-8-validate
'@kevisual/use-config@1.0.3': {} '@kevisual/use-config@1.0.3': {}
'@langchain/core@0.3.3(openai@4.65.0(encoding@0.1.13)(zod@3.23.8))': '@langchain/core@0.3.3(openai@4.65.0(encoding@0.1.13)(zod@3.23.8))':
@ -5256,12 +5241,6 @@ snapshots:
optionalDependencies: optionalDependencies:
rollup: 4.27.4 rollup: 4.27.4
'@rollup/plugin-json@6.1.0(rollup@4.27.2)':
dependencies:
'@rollup/pluginutils': 5.1.2(rollup@4.27.2)
optionalDependencies:
rollup: 4.27.2
'@rollup/plugin-json@6.1.0(rollup@4.27.4)': '@rollup/plugin-json@6.1.0(rollup@4.27.4)':
dependencies: dependencies:
'@rollup/pluginutils': 5.1.2(rollup@4.27.4) '@rollup/pluginutils': 5.1.2(rollup@4.27.4)
@ -5288,32 +5267,23 @@ snapshots:
optionalDependencies: optionalDependencies:
rollup: 4.27.4 rollup: 4.27.4
'@rollup/plugin-typescript@12.1.1(rollup@4.27.2)(tslib@2.7.0)(typescript@5.6.3)': '@rollup/plugin-typescript@12.1.1(rollup@4.27.2)(tslib@2.8.1)(typescript@5.7.2)':
dependencies:
'@rollup/pluginutils': 5.1.2(rollup@4.27.2)
resolve: 1.22.8
typescript: 5.6.3
optionalDependencies:
rollup: 4.27.2
tslib: 2.7.0
'@rollup/plugin-typescript@12.1.1(rollup@4.27.2)(tslib@2.7.0)(typescript@5.7.2)':
dependencies: dependencies:
'@rollup/pluginutils': 5.1.2(rollup@4.27.2) '@rollup/pluginutils': 5.1.2(rollup@4.27.2)
resolve: 1.22.8 resolve: 1.22.8
typescript: 5.7.2 typescript: 5.7.2
optionalDependencies: optionalDependencies:
rollup: 4.27.2 rollup: 4.27.2
tslib: 2.7.0 tslib: 2.8.1
'@rollup/plugin-typescript@12.1.1(rollup@4.27.4)(tslib@2.7.0)(typescript@5.7.2)': '@rollup/plugin-typescript@12.1.1(rollup@4.27.4)(tslib@2.8.1)(typescript@5.7.2)':
dependencies: dependencies:
'@rollup/pluginutils': 5.1.2(rollup@4.27.4) '@rollup/pluginutils': 5.1.2(rollup@4.27.4)
resolve: 1.22.8 resolve: 1.22.8
typescript: 5.7.2 typescript: 5.7.2
optionalDependencies: optionalDependencies:
rollup: 4.27.4 rollup: 4.27.4
tslib: 2.7.0 tslib: 2.8.1
'@rollup/pluginutils@5.1.2(rollup@4.27.2)': '@rollup/pluginutils@5.1.2(rollup@4.27.2)':
dependencies: dependencies:
@ -5772,7 +5742,7 @@ snapshots:
ast-types@0.13.4: ast-types@0.13.4:
dependencies: dependencies:
tslib: 2.7.0 tslib: 2.8.1
async@2.6.4: async@2.6.4:
dependencies: dependencies:
@ -7860,7 +7830,7 @@ snapshots:
rxjs@7.8.1: rxjs@7.8.1:
dependencies: dependencies:
tslib: 2.7.0 tslib: 2.8.1
safe-array-concat@1.1.2: safe-array-concat@1.1.2:
dependencies: dependencies:
@ -8278,16 +8248,6 @@ snapshots:
ts-lib@0.0.5: {} ts-lib@0.0.5: {}
ts-loader@9.5.1(typescript@5.6.3)(webpack@5.96.1(esbuild@0.23.1)):
dependencies:
chalk: 4.1.2
enhanced-resolve: 5.17.1
micromatch: 4.0.8
semver: 7.6.3
source-map: 0.7.4
typescript: 5.6.3
webpack: 5.96.1(esbuild@0.23.1)
ts-loader@9.5.1(typescript@5.7.2)(webpack@5.96.1(esbuild@0.23.1)): ts-loader@9.5.1(typescript@5.7.2)(webpack@5.96.1(esbuild@0.23.1)):
dependencies: dependencies:
chalk: 4.1.2 chalk: 4.1.2
@ -8304,6 +8264,8 @@ snapshots:
tslib@2.7.0: {} tslib@2.7.0: {}
tslib@2.8.1: {}
tsx@4.19.2: tsx@4.19.2:
dependencies: dependencies:
esbuild: 0.23.1 esbuild: 0.23.1
@ -8354,8 +8316,6 @@ snapshots:
is-typed-array: 1.1.13 is-typed-array: 1.1.13
possible-typed-array-names: 1.0.0 possible-typed-array-names: 1.0.0
typescript@5.6.3: {}
typescript@5.7.2: {} typescript@5.7.2: {}
unbox-primitive@1.0.2: unbox-primitive@1.0.2:

View File

@ -52,11 +52,11 @@ app
description: 'Deploy micro app', description: 'Deploy micro app',
}) })
.define(async (ctx) => { .define(async (ctx) => {
// const { id, key} = ctx.query?.data; const { id, key} = ctx.query?.data;
// const id = '10f03411-85fc-4d37-a4d3-e32b15566a6c'; // const id = '10f03411-85fc-4d37-a4d3-e32b15566a6c';
// const key = 'envision-cli'; // const key = 'envision-cli';
const id = '7c54a6de-9171-4093-926d-67a035042c6c'; // const id = '7c54a6de-9171-4093-926d-67a035042c6c';
const key = 'mark'; // const key = 'mark';
if (!id) { if (!id) {
ctx.throw(400, 'Invalid id'); ctx.throw(400, 'Invalid id');
} }
@ -85,8 +85,8 @@ app
description: 'Load micro app, no use', description: 'Load micro app, no use',
}) })
.define(async (ctx) => { .define(async (ctx) => {
// const { key } = ctx.query?.data; const { key } = ctx.query?.data;
const key = 'mark'; // const key = 'mark';
try { try {
const main = await loadApp(key); const main = await loadApp(key);
if (main?.loadApp) { if (main?.loadApp) {
@ -107,8 +107,8 @@ app
key: 'unload', key: 'unload',
}) })
.define(async (ctx) => { .define(async (ctx) => {
// const { key } = ctx.query?.data; const { key } = ctx.query?.data;
const key = 'mark'; // const key = 'mark';
const main = manager.getAppShowInfo(key); const main = manager.getAppShowInfo(key);
if (!main) { if (!main) {
ctx.throw(400, 'Invalid app'); ctx.throw(400, 'Invalid app');

View File

@ -34,11 +34,14 @@ app
} }
let user: User | null = null; let user: User | null = null;
if (username) { if (username) {
user = await User.findOne({ where: { username } }); user = await User.findOne({ where: { username }, logging: false });
} }
if (!user && email) { if (!user && email) {
user = await User.findOne({ where: { email } }); user = await User.findOne({ where: { email } });
} }
console.log('user logiin', ctx.query)
console.log('user logiin', user)
console.log('users', (await User.findAll()).map(u => u.username))
if (!user) { if (!user) {
ctx.throw(500, 'Login Failed'); ctx.throw(500, 'Login Failed');
} }