Просмотр исходного кода

update slackbot proxy tsed version to 7

Futa Arai 1 год назад
Родитель
Сommit
06c58b8db3

+ 9 - 10
apps/slackbot-proxy/package.json

@@ -37,13 +37,12 @@
     "@growi/slack": "workspace:^",
     "@slack/oauth": "^2.0.1",
     "@slack/web-api": "^6.2.4",
-    "@tsed/common": "=6.43.0",
-    "@tsed/di": "=6.43.0",
-    "@tsed/logger": "=5.17.0",
-    "@tsed/platform-express": "=6.43.0",
-    "@tsed/schema": "=6.43.0",
-    "@tsed/swagger": "=6.43.0",
-    "@tsed/typeorm": "=6.43.0",
+    "@tsed/common": "=7.85.1",
+    "@tsed/di": "=7.85.1",
+    "@tsed/platform-express": "=7.85.1",
+    "@tsed/schema": "=7.85.1",
+    "@tsed/swagger": "=7.85.1",
+    "@tsed/typeorm": "=7.85.1",
     "axios": "^0.24.0",
     "body-parser": "^1.20.3",
     "browser-bunyan": "^1.6.3",
@@ -71,9 +70,9 @@
   },
   "devDependencies": {
     "@popperjs/core": "^2.11.8",
-    "@tsed/core": "=6.43.0",
-    "@tsed/exceptions": "=6.43.0",
-    "@tsed/json-mapper": "=6.43.0",
+    "@tsed/core": "=7.85.1",
+    "@tsed/exceptions": "=7.85.1",
+    "@tsed/json-mapper": "=7.85.1",
     "@types/bunyan": "^1.8.11",
     "bootstrap": "=5.3.2",
     "browser-bunyan": "^1.6.3",

+ 7 - 4
apps/slackbot-proxy/src/Server.ts

@@ -2,9 +2,11 @@ import '@tsed/platform-express'; // !! DO NOT MODIFY !!
 import '@tsed/swagger';
 import '@tsed/typeorm'; // !! DO NOT MODIFY !! -- https://github.com/tsedio/tsed/issues/1332#issuecomment-837840612
 
+import Http from 'http';
+
 import { createTerminus } from '@godaddy/terminus';
 /* eslint-disable @typescript-eslint/consistent-type-imports */
-import { HttpServer, PlatformApplication } from '@tsed/common';
+import { PlatformApplication } from '@tsed/common';
 import { Configuration, Inject, InjectorService } from '@tsed/di';
 /* eslint-enable @typescript-eslint/consistent-type-imports */
 import bodyParser from 'body-parser';
@@ -130,6 +132,9 @@ export class Server {
   @Inject()
   injector: InjectorService;
 
+  @Inject(Http.Server)
+  server: Http.Server;
+
   $beforeInit(): Promise<any> | void {
     const serverUri = process.env.SERVER_URI;
 
@@ -157,10 +162,8 @@ export class Server {
   }
 
   $beforeListen(): void {
-    const server = this.injector.get<HttpServer>(HttpServer);
-
     // init terminus
-    createTerminus(server, {
+    createTerminus(this.server, {
       onSignal: async() => {
         logger.info('server is starting cleanup');
         const connectionManager = getConnectionManager();

+ 2 - 2
apps/slackbot-proxy/src/middlewares/growi-to-slack/add-webclient-response-to-res.ts

@@ -1,6 +1,6 @@
 import { ErrorCode } from '@slack/web-api';
 import {
-  IMiddleware, Middleware, Next, Req, Res,
+  MiddlewareMethods, Middleware, Next, Req, Res,
 } from '@tsed/common';
 
 
@@ -11,7 +11,7 @@ export type WebclientRes = Res & {
 
 
 @Middleware()
-export class AddWebclientResponseToRes implements IMiddleware {
+export class AddWebclientResponseToRes implements MiddlewareMethods {
 
   use(@Req() req: Req, @Res() res: WebclientRes, @Next() next: Next): void {
 

+ 2 - 2
apps/slackbot-proxy/src/middlewares/slack-to-growi/add-signing-secret-to-req.ts

@@ -1,10 +1,10 @@
 import type { RequestFromSlack } from '@growi/slack';
 import {
-  type IMiddleware, Middleware, Next, Req, Res,
+  type MiddlewareMethods, Middleware, Next, Req, Res,
 } from '@tsed/common';
 
 @Middleware()
-export class AddSigningSecretToReq implements IMiddleware {
+export class AddSigningSecretToReq implements MiddlewareMethods {
 
   use(@Req() req: Req & RequestFromSlack, @Res() res: Res, @Next() next: Next): void {
     req.slackSigningSecret = process.env.SLACK_SIGNING_SECRET;

+ 4 - 4
apps/slackbot-proxy/src/middlewares/slack-to-growi/authorizer.ts

@@ -1,6 +1,6 @@
 import { AuthorizeResult, InstallationQuery } from '@slack/oauth';
 import {
-  IMiddleware, Inject, Middleware, Next, Req, Res,
+  MiddlewareMethods, Inject, Middleware, Next, Req, Res,
 } from '@tsed/common';
 import Logger from 'bunyan';
 import createError from 'http-errors';
@@ -40,7 +40,7 @@ const getCommonMiddleware = (query:InstallationQuery<boolean>, installerService:
   };
 };
 @Middleware()
-export class AuthorizeCommandMiddleware implements IMiddleware {
+export class AuthorizeCommandMiddleware implements MiddlewareMethods {
 
   private logger: Logger;
 
@@ -69,7 +69,7 @@ export class AuthorizeCommandMiddleware implements IMiddleware {
 }
 
 @Middleware()
-export class AuthorizeInteractionMiddleware implements IMiddleware {
+export class AuthorizeInteractionMiddleware implements MiddlewareMethods {
 
   private logger: Logger;
 
@@ -105,7 +105,7 @@ export class AuthorizeInteractionMiddleware implements IMiddleware {
 
 }
 @Middleware()
-export class AuthorizeEventsMiddleware implements IMiddleware {
+export class AuthorizeEventsMiddleware implements MiddlewareMethods {
 
   private logger: Logger;
 

+ 2 - 2
apps/slackbot-proxy/src/middlewares/slack-to-growi/extract-growi-uri-from-req.ts

@@ -1,5 +1,5 @@
 import {
-  IMiddleware, Inject, Middleware, Next, Req, Res,
+  MiddlewareMethods, Inject, Middleware, Next, Req, Res,
 } from '@tsed/common';
 
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
@@ -8,7 +8,7 @@ import { ViewInteractionPayloadDelegator } from '~/services/growi-uri-injector/V
 
 
 @Middleware()
-export class ExtractGrowiUriFromReq implements IMiddleware {
+export class ExtractGrowiUriFromReq implements MiddlewareMethods {
 
   @Inject()
   viewInteractionPayloadDelegator: ViewInteractionPayloadDelegator;

+ 2 - 2
apps/slackbot-proxy/src/middlewares/slack-to-growi/join-to-conversation.ts

@@ -1,6 +1,6 @@
 import { generateWebClient } from '@growi/slack/dist/utils/webclient-factory';
 import {
-  IMiddleware, Middleware, Req,
+  MiddlewareMethods, Middleware, Req,
 } from '@tsed/common';
 import Logger from 'bunyan';
 
@@ -14,7 +14,7 @@ const logger: Logger = loggerFactory('slackbot-proxy:middlewares:JoinToConversat
  * This middleware should be processed after AuthorizeCommandMiddleware or AuthorizeInteractionMiddleware
  */
 @Middleware()
-export class JoinToConversationMiddleware implements IMiddleware {
+export class JoinToConversationMiddleware implements MiddlewareMethods {
 
   async use(@Req() req: SlackOauthReq): Promise<void> {
     const { body, authorizeResult } = req;

+ 2 - 2
apps/slackbot-proxy/src/middlewares/slack-to-growi/parse-interaction-req.ts

@@ -1,11 +1,11 @@
 import type { RequestFromSlack } from '@growi/slack';
 import {
-  type IMiddleware, Middleware, Next, Req,
+  type MiddlewareMethods, Middleware, Next, Req,
 } from '@tsed/common';
 
 
 @Middleware()
-export class ParseInteractionPayloadMiddleare implements IMiddleware {
+export class ParseInteractionPayloadMiddleare implements MiddlewareMethods {
 
   use(@Req() req: RequestFromSlack, @Next() next: Next): void {
 

+ 2 - 2
apps/slackbot-proxy/src/middlewares/slack-to-growi/url-verification.ts

@@ -1,12 +1,12 @@
 import {
-  IMiddleware, Middleware, Req, Res, Next,
+  MiddlewareMethods, Middleware, Req, Res, Next,
 } from '@tsed/common';
 
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
 
 
 @Middleware()
-export class UrlVerificationMiddleware implements IMiddleware {
+export class UrlVerificationMiddleware implements MiddlewareMethods {
 
   async use(@Req() req: SlackOauthReq, @Res() res: Res, @Next() next: Next): Promise<void> {
 

Разница между файлами не показана из-за своего большого размера
+ 276 - 372
pnpm-lock.yaml


Некоторые файлы не были показаны из-за большого количества измененных файлов