From cabd9ba3676840c7ea44ee3a18e9f82492e0758e Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Tue, 13 Sep 2022 15:39:12 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7moleculer=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 5 + patches/moleculer-minio@2.0.0.patch | 22 +++ pnpm-lock.yaml | 162 +++++++++++------- server/package.json | 4 +- server/packages/sdk/package.json | 6 +- .../sdk/src/runner/moleculer.config.ts | 4 + 6 files changed, 139 insertions(+), 64 deletions(-) create mode 100644 patches/moleculer-minio@2.0.0.patch diff --git a/package.json b/package.json index 476e7170..ede8f7fc 100644 --- a/package.json +++ b/package.json @@ -46,5 +46,10 @@ "dependencies": { "crc": "^3.8.0", "lodash": "^4.17.21" + }, + "pnpm": { + "patchedDependencies": { + "moleculer-minio@2.0.0": "patches/moleculer-minio@2.0.0.patch" + } } } diff --git a/patches/moleculer-minio@2.0.0.patch b/patches/moleculer-minio@2.0.0.patch new file mode 100644 index 00000000..da912632 --- /dev/null +++ b/patches/moleculer-minio@2.0.0.patch @@ -0,0 +1,22 @@ +diff --git a/src/errors/MinioInitializationError.js b/src/errors/MinioInitializationError.js +index 2022b251c5bc9c036c7456d6937c270f8f920d3a..ae9d3808d87f8fe0ee5e82076802da09a1a7f676 100644 +--- a/src/errors/MinioInitializationError.js ++++ b/src/errors/MinioInitializationError.js +@@ -1,4 +1,5 @@ +-const {MoleculerError} = require("moleculer/src/errors"); ++const {Errors} = require('moleculer'); ++const MoleculerError = Errors.MoleculerError; + + /** + * Error that should be thrown when the Minio Service can not be Initialized +diff --git a/src/errors/MinioPingError.js b/src/errors/MinioPingError.js +index f73f9423f3407fe828ba99db556b2f8367483fa3..d03e31c2a223b6182c659b0c13beb7e1f11751d4 100644 +--- a/src/errors/MinioPingError.js ++++ b/src/errors/MinioPingError.js +@@ -1,4 +1,5 @@ +-const {MoleculerRetryableError} = require("moleculer/src/errors"); ++const {Errors} = require('moleculer'); ++const MoleculerRetryableError = Errors.MoleculerRetryableError; + + /** + * Error that should be thrown when the Minio Backend can not be pinged \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 18f40714..24fa6935 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,10 @@ lockfileVersion: 5.4 +patchedDependencies: + moleculer-minio@2.0.0: + hash: 77awcwzrgh47fhn6qqq4ghcfau + path: patches/moleculer-minio@2.0.0.patch + importers: .: @@ -523,7 +528,7 @@ importers: mime: ^2.5.2 mini-star: ^1.2.8 mkdirp: ^1.0.4 - moleculer: 0.14.18 + moleculer: 0.14.23 moleculer-cli: ^0.7.1 moleculer-minio: ^2.0.0 moleculer-repl: ^0.6.5 @@ -571,8 +576,8 @@ importers: lodash: 4.17.21 mime: 2.6.0 mkdirp: 1.0.4 - moleculer-minio: 2.0.0_moleculer@0.14.18 - moleculer-web: 0.10.4_moleculer@0.14.18 + moleculer-minio: 2.0.0_77awcwzrgh47fhn6qqq4ghcfau_moleculer@0.14.23 + moleculer-web: 0.10.4_moleculer@0.14.23 moment: 2.29.4 mongodb: 4.2.1 mongoose: 6.1.1 @@ -616,7 +621,7 @@ importers: inquirer: 8.2.4 jest: 27.5.1_ts-node@10.9.1 mini-star: 1.3.1 - moleculer: 0.14.18_v2nojfag4zngjtjfzx3xixwhsy + moleculer: 0.14.23_v2nojfag4zngjtjfzx3xixwhsy moleculer-cli: 0.7.1_aq42ly5xd6eunvb7egqihu226a moleculer-repl: 0.6.6 neo-blessed: 0.2.0 @@ -638,9 +643,9 @@ importers: ioredis: ^4.27.6 kleur: ^4.1.4 lodash: ^4.17.21 - moleculer: 0.14.18 - moleculer-db: 0.8.16 - moleculer-repl: ^0.6.5 + moleculer: 0.14.23 + moleculer-db: 0.8.19 + moleculer-repl: ^0.7.2 moment: ^2.29.1 mongodb: 4.2.1 mongoose: 6.1.1 @@ -656,9 +661,9 @@ importers: ioredis: 4.28.5 kleur: 4.1.5 lodash: 4.17.21 - moleculer: 0.14.18_ioredis@4.28.5 - moleculer-db: 0.8.16_moleculer@0.14.18 - moleculer-repl: 0.6.6 + moleculer: 0.14.23_ioredis@4.28.5 + moleculer-db: 0.8.19_moleculer@0.14.23 + moleculer-repl: 0.7.2 moment: 2.29.4 mongodb: 4.2.1 mongoose: 6.1.1 @@ -3855,6 +3860,7 @@ packages: node-localstorage: 1.3.1 strip-ansi: 5.2.0 wrap-ansi: 6.2.0 + dev: true /@moonrailgun/socket.io-admin-ui/0.2.1_socket.io@4.5.1: resolution: {integrity: sha512-ytOOegalEaS77WG1suYl7sNt4DNzKaUMZJ2MZGK5HR9MkL9JKeHaxj/cTp1cmgHLrPshC7dG8yRuyocK/rllZQ==} @@ -4106,12 +4112,12 @@ packages: resolution: {integrity: sha512-+pYGvPFAk7wUR+ONMOlc6A+LUN4kOCFwyPLjyaeS7wVibADPHWYJNYsNtyIAwjF1AXQkuaXElnIc4XjKt55QZA==} dev: false - /@seald-io/nedb/2.2.2: - resolution: {integrity: sha512-z91J3pem4ENzHuu9BilOSdlGL2S14OQYePPdvBcPHgHr+s51VIUwQARcOjx21KvtkA27vEpgPqzrVKh7nSlIfw==} + /@seald-io/nedb/3.1.0: + resolution: {integrity: sha512-5G0hCQGJjOelOutvW1l4VD581XMhTPxpj1BUaCWTEM2MPXR9TzIr0MKMnEjnTA5nEKfujPyvVW7iF3etm1/gKQ==} dependencies: '@seald-io/binary-search-tree': 1.0.2 - async: 0.2.10 localforage: 1.10.0 + util: 0.12.4 dev: false /@sideway/address/4.1.4: @@ -7341,6 +7347,7 @@ packages: /ansi-escapes/3.2.0: resolution: {integrity: sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==} engines: {node: '>=4'} + dev: true /ansi-escapes/4.3.2: resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==} @@ -7365,6 +7372,7 @@ packages: /ansi-regex/4.1.1: resolution: {integrity: sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==} engines: {node: '>=6'} + dev: true /ansi-regex/5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} @@ -7724,10 +7732,6 @@ packages: resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} dev: false - /async/0.2.10: - resolution: {integrity: sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==} - dev: false - /async/3.2.4: resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==} @@ -7985,6 +7989,7 @@ packages: babel-runtime: 6.26.0 core-js: 2.6.12 regenerator-runtime: 0.10.5 + dev: true /babel-preset-current-node-syntax/1.0.1_@babel+core@7.18.13: resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==} @@ -9149,7 +9154,6 @@ packages: /commander/9.4.0: resolution: {integrity: sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==} engines: {node: ^12.20.0 || >=14} - dev: true /commitlint/17.0.3: resolution: {integrity: sha512-/KbIyrd6nmrRvu5zj8KKrjoC4z5V6hBmYphHgCFu75kPjHODg1XTtGFgbnb0AdSGBHlGMzmDvykO7ETs8wBKFg==} @@ -9317,7 +9321,7 @@ packages: lodash: ^4.17.20 marko: ^3.14.4 mote: ^0.2.0 - mustache: ^4.0.1 + mustache: ^3.0.0 nunjucks: ^3.2.2 plates: ~0.4.11 pug: ^3.0.0 @@ -9498,8 +9502,8 @@ packages: engines: {node: '>=10'} hasBin: true dependencies: - is-text-path: 1.0.1 JSONStream: 1.3.5 + is-text-path: 1.0.1 lodash: 4.17.21 meow: 8.1.2 split2: 3.2.2 @@ -10804,6 +10808,7 @@ packages: /emoji-regex/7.0.3: resolution: {integrity: sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==} + dev: true /emoji-regex/8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -13782,6 +13787,7 @@ packages: /in-publish/2.0.1: resolution: {integrity: sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==} hasBin: true + dev: true /indent-string/2.1.0: resolution: {integrity: sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==} @@ -13873,6 +13879,7 @@ packages: string-width: 4.2.3 strip-ansi: 5.2.0 through: 2.3.8 + dev: true /inquirer/7.3.3: resolution: {integrity: sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==} @@ -14719,7 +14726,7 @@ packages: pretty-format: 27.5.1 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.9.1_t4lrjbt3sxauai4t5o275zsepa + ts-node: 10.9.1_bqee57coj3oib6dw4m24wknwqe transitivePeerDependencies: - bufferutil - canvas @@ -15298,6 +15305,7 @@ packages: /json-stringify-safe/5.0.1: resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==} + dev: true /json2mq/0.2.0: resolution: {integrity: sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA==} @@ -15855,6 +15863,7 @@ packages: ansi-escapes: 3.2.0 cli-cursor: 2.1.0 wrap-ansi: 5.1.0 + dev: true /log-update/4.0.0: resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==} @@ -16422,8 +16431,8 @@ packages: /minimist/1.2.6: resolution: {integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==} - /minio/7.0.31: - resolution: {integrity: sha512-owtqQot7UP9snjYnpQKTzf1mT5koRilvKgr9tKZnWEwyHnFRFA/qOnY/Ayn25BX3eaagFdr8mFMp25qThbL8dA==} + /minio/7.0.32: + resolution: {integrity: sha512-txa7Vr0N24MKzeAybP/wY1jxbLnfGHXwZYyfFXuMW55HX2+HOcKEIgH4hU6Qj/kiMgyXs/ozHjAuLIDrR8nwLg==} engines: {node: '>8 <=18'} dependencies: async: 3.2.4 @@ -16622,30 +16631,31 @@ packages: - winston dev: true - /moleculer-db/0.8.16_moleculer@0.14.18: - resolution: {integrity: sha512-UXe8SMgbAGN4dGBEEcIbkEUJTyNh9A2wrX36C4RlZuzJUuzv3O5ecyvVGm1C1g/fuwyOFJfrqWP716Icy13EEA==} + /moleculer-db/0.8.19_moleculer@0.14.23: + resolution: {integrity: sha512-MRlFmPrQy7AqUQWGBnzyF1vIcUX46L17OFDjom6OFNqtqwb4wloVNz2PDdWfZI12w4olToMfDon+O4ugWH1R6Q==} engines: {node: '>= 8.x.x'} peerDependencies: moleculer: ^0.12.0 || ^0.13.0 || ^0.14.0 dependencies: - '@seald-io/nedb': 2.2.2 + '@seald-io/nedb': 3.1.0 bluebird: 3.7.2 flat: 5.0.2 lodash: 4.17.21 - moleculer: 0.14.18_ioredis@4.28.5 + moleculer: 0.14.23_ioredis@4.28.5 dev: false - /moleculer-minio/2.0.0_moleculer@0.14.18: + /moleculer-minio/2.0.0_77awcwzrgh47fhn6qqq4ghcfau_moleculer@0.14.23: resolution: {integrity: sha512-2INKAtdgboR8VQC9Vp0W4u5yy6XVxUW5UmP8akoggMa1BuvJ8m6hUlY/Y2VpcQ6FJIrQa9hHz5B38IMmXd7ZqQ==} engines: {node: '>= 14.x.x'} peerDependencies: moleculer: '>= 0.13.0' dependencies: - minio: 7.0.31 - moleculer: 0.14.18_v2nojfag4zngjtjfzx3xixwhsy + minio: 7.0.32 + moleculer: 0.14.23_v2nojfag4zngjtjfzx3xixwhsy ramda: 0.27.1 ramda-adjunct: 2.36.0_ramda@0.27.1 dev: false + patched: true /moleculer-repl/0.6.6: resolution: {integrity: sha512-XQuz6PdosVgm8SkqJ21gba+VlDGvDHMd2yGhZyeZaoacWEe1wovA8Smr+JuAwFCz6YEpv6Gp6NVLMyHoG5DcsQ==} @@ -16661,8 +16671,26 @@ packages: pretty-bytes: 5.6.0 table: 6.8.0 tiny-human-time: 1.2.0 + dev: true + + /moleculer-repl/0.7.2: + resolution: {integrity: sha512-f+vK8tu3LZUa9iD6A1iLJxYGBJ1aDbStwoJKG7BcsZNtkHRbLvvQsp39qxQGfz7QCjUbXkDGXDanQ/DqSw1FTA==} + engines: {node: '>= 12.x.x'} + dependencies: + clui: 0.3.6 + commander: 9.4.0 + glob: 7.2.3 + kleur: 4.1.5 + lodash: 4.17.21 + ora: 5.4.1 + pretty-bytes: 5.6.0 + string-argv: 0.3.1 + table: 6.8.0 + tiny-human-time: 1.2.0 + yargs-parser: 21.1.1 + dev: false - /moleculer-web/0.10.4_moleculer@0.14.18: + /moleculer-web/0.10.4_moleculer@0.14.23: resolution: {integrity: sha512-WU5jZRoH53D3Cx2eBPFPlY5+7RI4teb5nlupRZO0N9vkRblGIFm4ySahZxBN4xVXvFSF5EWt/j1BdQr5rBocVw==} engines: {node: '>= 10.x.x'} peerDependencies: @@ -16676,7 +16704,7 @@ packages: isstream: 0.1.2 kleur: 4.1.5 lodash: 4.17.21 - moleculer: 0.14.18_v2nojfag4zngjtjfzx3xixwhsy + moleculer: 0.14.23_v2nojfag4zngjtjfzx3xixwhsy path-to-regexp: 3.2.0 qs: 6.11.0 serve-static: 1.15.0 @@ -16684,32 +16712,32 @@ packages: - supports-color dev: false - /moleculer/0.14.18_ioredis@4.28.5: - resolution: {integrity: sha512-5+bVT0TC1MfKq3YkOKQxCr9KbdCBmfs+9AZKJBYyO+ewEIiElHZBs3NuFeHLO+wO8ti0qMh2R31r28vEyCI2tA==} + /moleculer/0.14.23_ioredis@4.28.5: + resolution: {integrity: sha512-DE84fy8+1QiA7kUkF9ce4nyDdptBDlLFQfsaUccTScMGAbEjye5e+zfoI9iSA9rznwvshC8tgLhbOcnQBMn/HA==} engines: {node: '>= 10.x.x'} hasBin: true peerDependencies: - amqplib: ^0.7.0 || ^0.8.0 + amqplib: ^0.7.0 || ^0.8.0 || ^0.9.0 || ^0.10.0 avsc: ^5.0.0 bunyan: ^1.0.0 - cbor-x: ^0.8.3 + cbor-x: ^0.8.3 || ^0.9.0 || ^1.2.0 dd-trace: ^0.33.0 || ^0.34.0 || ^0.35.0 || ^0.36.0 || >=1.0.0 <1.6.0 debug: ^4.0.0 etcd3: ^1.0.0 - ioredis: ^4.0.0 + ioredis: ^4.0.0 || ^5.0.0 jaeger-client: ^3.0.0 kafka-node: ^5.0.0 log4js: ^6.0.0 mqtt: ^4.0.0 - msgpack5: ^5.0.0 + msgpack5: ^5.0.0 || ^6.0.0 nats: ^1.0.0 || ^2.0.0 node-nats-streaming: ^0.0.51 || ^0.2.0 || ^0.3.0 - notepack.io: 2.0.0 - pino: ^6.0.0 || ^7.0.0 - protobufjs: ^6.0.0 + notepack.io: ^2.0.0 || ^3.0.0 + pino: ^6.0.0 || ^7.0.0 || ^8.0.0 + protobufjs: ^6.0.0 || ^7.0.0 redlock: ^4.0.0 rhea-promise: ^1.0.0 || ^2.0.0 - thrift: ^0.12.0 + thrift: ^0.12.0 || ^0.16.0 winston: ^3.0.0 peerDependenciesMeta: amqplib: @@ -16772,32 +16800,32 @@ packages: - encoding dev: false - /moleculer/0.14.18_v2nojfag4zngjtjfzx3xixwhsy: - resolution: {integrity: sha512-5+bVT0TC1MfKq3YkOKQxCr9KbdCBmfs+9AZKJBYyO+ewEIiElHZBs3NuFeHLO+wO8ti0qMh2R31r28vEyCI2tA==} + /moleculer/0.14.23_k357mkujapyz37xu6kaptfw3rm: + resolution: {integrity: sha512-DE84fy8+1QiA7kUkF9ce4nyDdptBDlLFQfsaUccTScMGAbEjye5e+zfoI9iSA9rznwvshC8tgLhbOcnQBMn/HA==} engines: {node: '>= 10.x.x'} hasBin: true peerDependencies: - amqplib: ^0.7.0 || ^0.8.0 + amqplib: ^0.7.0 || ^0.8.0 || ^0.9.0 || ^0.10.0 avsc: ^5.0.0 bunyan: ^1.0.0 - cbor-x: ^0.8.3 + cbor-x: ^0.8.3 || ^0.9.0 || ^1.2.0 dd-trace: ^0.33.0 || ^0.34.0 || ^0.35.0 || ^0.36.0 || >=1.0.0 <1.6.0 debug: ^4.0.0 etcd3: ^1.0.0 - ioredis: ^4.0.0 + ioredis: ^4.0.0 || ^5.0.0 jaeger-client: ^3.0.0 kafka-node: ^5.0.0 log4js: ^6.0.0 mqtt: ^4.0.0 - msgpack5: ^5.0.0 + msgpack5: ^5.0.0 || ^6.0.0 nats: ^1.0.0 || ^2.0.0 node-nats-streaming: ^0.0.51 || ^0.2.0 || ^0.3.0 - notepack.io: 2.0.0 - pino: ^6.0.0 || ^7.0.0 - protobufjs: ^6.0.0 + notepack.io: ^2.0.0 || ^3.0.0 + pino: ^6.0.0 || ^7.0.0 || ^8.0.0 + protobufjs: ^6.0.0 || ^7.0.0 redlock: ^4.0.0 rhea-promise: ^1.0.0 || ^2.0.0 - thrift: ^0.12.0 + thrift: ^0.12.0 || ^0.16.0 winston: ^3.0.0 peerDependenciesMeta: amqplib: @@ -16854,13 +16882,15 @@ packages: kleur: 4.1.5 lodash: 4.17.21 lru-cache: 6.0.0 + nats: 1.4.12 node-fetch: 2.6.7 recursive-watch: 1.1.4 redlock: 4.2.0 transitivePeerDependencies: - encoding + dev: true - /moleculer/0.14.23_k357mkujapyz37xu6kaptfw3rm: + /moleculer/0.14.23_v2nojfag4zngjtjfzx3xixwhsy: resolution: {integrity: sha512-DE84fy8+1QiA7kUkF9ce4nyDdptBDlLFQfsaUccTScMGAbEjye5e+zfoI9iSA9rznwvshC8tgLhbOcnQBMn/HA==} engines: {node: '>= 10.x.x'} hasBin: true @@ -16942,13 +16972,11 @@ packages: kleur: 4.1.5 lodash: 4.17.21 lru-cache: 6.0.0 - nats: 1.4.12 node-fetch: 2.6.7 recursive-watch: 1.1.4 redlock: 4.2.0 transitivePeerDependencies: - encoding - dev: true /moment/2.29.4: resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==} @@ -17239,6 +17267,7 @@ packages: engines: {node: '>=0.12'} dependencies: write-file-atomic: 1.3.4 + dev: true /node-releases/2.0.6: resolution: {integrity: sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==} @@ -19807,6 +19836,12 @@ packages: /react-dev-utils/12.0.1_xnp4kzegbjokq62cajex2ovgkm: resolution: {integrity: sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==} engines: {node: '>=14'} + peerDependencies: + typescript: '>=2.7' + webpack: '>=4' + peerDependenciesMeta: + typescript: + optional: true dependencies: '@babel/code-frame': 7.18.6 address: 1.2.0 @@ -19832,12 +19867,12 @@ packages: shell-quote: 1.7.3 strip-ansi: 6.0.1 text-table: 0.2.0 + typescript: 4.7.4 + webpack: 5.74.0 transitivePeerDependencies: - eslint - supports-color - - typescript - vue-template-compiler - - webpack dev: false /react-docgen-typescript/2.2.2_typescript@4.7.4: @@ -21037,6 +21072,7 @@ packages: engines: {npm: '>=2.0.0'} dependencies: tslib: 1.14.1 + dev: true /rxjs/7.5.6: resolution: {integrity: sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==} @@ -21471,6 +21507,7 @@ packages: /slide/1.1.6: resolution: {integrity: sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==} + dev: true /smoothscroll-polyfill/0.4.4: resolution: {integrity: sha512-TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg==} @@ -21885,7 +21922,6 @@ packages: /string-argv/0.3.1: resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==} engines: {node: '>=0.6.19'} - dev: true /string-convert/0.2.1: resolution: {integrity: sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A==} @@ -21914,6 +21950,7 @@ packages: emoji-regex: 7.0.3 is-fullwidth-code-point: 2.0.0 strip-ansi: 5.2.0 + dev: true /string-width/4.2.3: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} @@ -22012,6 +22049,7 @@ packages: engines: {node: '>=6'} dependencies: ansi-regex: 4.1.1 + dev: true /strip-ansi/6.0.1: resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} @@ -22953,6 +22991,7 @@ packages: typescript: 4.7.4 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + dev: false /ts-pnp/1.2.0_typescript@4.7.4: resolution: {integrity: sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==} @@ -23181,6 +23220,7 @@ packages: /unified/8.4.2: resolution: {integrity: sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA==} dependencies: + '@types/unist': 2.0.6 bail: 1.0.5 extend: 3.0.2 is-plain-obj: 2.1.0 @@ -23191,6 +23231,7 @@ packages: /unified/9.2.0: resolution: {integrity: sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==} dependencies: + '@types/unist': 2.0.6 bail: 1.0.5 extend: 3.0.2 is-buffer: 2.0.5 @@ -23201,6 +23242,7 @@ packages: /unified/9.2.2: resolution: {integrity: sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==} dependencies: + '@types/unist': 2.0.6 bail: 1.0.5 extend: 3.0.2 is-buffer: 2.0.5 @@ -24550,6 +24592,7 @@ packages: ansi-styles: 3.2.1 string-width: 3.1.0 strip-ansi: 5.2.0 + dev: true /wrap-ansi/6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} @@ -24558,6 +24601,7 @@ packages: ansi-styles: 4.3.0 string-width: 4.2.3 strip-ansi: 6.0.1 + dev: true /wrap-ansi/7.0.0: resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} @@ -24591,6 +24635,7 @@ packages: graceful-fs: 4.2.10 imurmurhash: 0.1.4 slide: 1.1.6 + dev: true /write-file-atomic/3.0.3: resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==} @@ -24726,7 +24771,6 @@ packages: /yargs-parser/21.1.1: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} - dev: true /yargs/15.4.1: resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==} diff --git a/server/package.json b/server/package.json index ae48b649..37d658f1 100644 --- a/server/package.json +++ b/server/package.json @@ -99,7 +99,7 @@ "inquirer": "^8.2.2", "jest": "^27.0.6", "mini-star": "^1.2.8", - "moleculer": "0.14.18", + "moleculer": "0.14.23", "moleculer-cli": "^0.7.1", "moleculer-repl": "^0.6.5", "neo-blessed": "^0.2.0", @@ -110,6 +110,6 @@ "vinyl-fs": "^3.0.3" }, "peerDependencies": { - "moleculer": "0.14.18" + "moleculer": "0.14.23" } } diff --git a/server/packages/sdk/package.json b/server/packages/sdk/package.json index b038d77d..b7880fd2 100644 --- a/server/packages/sdk/package.json +++ b/server/packages/sdk/package.json @@ -42,9 +42,9 @@ "ioredis": "^4.27.6", "kleur": "^4.1.4", "lodash": "^4.17.21", - "moleculer": "0.14.18", - "moleculer-db": "0.8.16", - "moleculer-repl": "^0.6.5", + "moleculer": "0.14.23", + "moleculer-db": "0.8.19", + "moleculer-repl": "^0.7.2", "moment": "^2.29.1", "mongodb": "4.2.1", "mongoose": "6.1.1" diff --git a/server/packages/sdk/src/runner/moleculer.config.ts b/server/packages/sdk/src/runner/moleculer.config.ts index 3cb97388..3f578179 100644 --- a/server/packages/sdk/src/runner/moleculer.config.ts +++ b/server/packages/sdk/src/runner/moleculer.config.ts @@ -10,6 +10,7 @@ import type { UserJWTPayload } from '../services/types'; import moment from 'moment'; import kleur from 'kleur'; import { config } from '../services/lib/settings'; +import 'moleculer-repl'; /** * Moleculer ServiceBroker configuration file @@ -251,6 +252,9 @@ const brokerConfig: BrokerOptions = { command: 'login', description: 'Auto login or register tailchat user for cli test', options: [{ option: '-u, --username', description: 'Username' }], + alias: null, + allowUnknownOptions: null, + parse: null, action(broker: ServiceBroker, args) { const username = args.options.username ?? 'localtest'; const password = 'localtest';