From 3a06e44e855db603c3887237afe9284c4aec1780 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Wed, 9 Aug 2023 16:23:31 +0000 Subject: [PATCH] fix --- server/api/Login/ChangePassword.ts | 17 +++++++++++------ server/api/Login/LoginByID.ts | 12 ++++++------ server/api/Login/LoginByToken.ts | 12 ++++++------ server/api/Login/ReqNonce.ts | 10 +++++----- server/api/Login/index.ts | 12 ++++++------ server/api/Login/test.ts | 8 ++++---- server/api/ProcDecorator/ParseUserLevel.ts | 6 +++--- server/api/ProcDecorator/ReqGameLogin.ts | 6 +++--- server/api/ProcDecorator/ReqLogin.ts | 4 ++-- server/api/ProcDecorator/StartSession.ts | 2 +- server/api/defs.ts | 2 +- server/api/root.ts | 6 +++--- server/apiStructure/sammoRootAPI.ts | 2 +- server/clientAPI/generator.ts | 2 +- server/clientAPI/sammoRootAPI.ts | 8 ++++---- server/util/RandUtil.ts | 2 +- server/util/convertIDArray.ts | 2 +- server/util/getDateTimeNow.ts | 2 +- 18 files changed, 60 insertions(+), 55 deletions(-) diff --git a/server/api/Login/ChangePassword.ts b/server/api/Login/ChangePassword.ts index 745dbf7..0007399 100644 --- a/server/api/Login/ChangePassword.ts +++ b/server/api/Login/ChangePassword.ts @@ -1,7 +1,9 @@ -import { GET } from "../defs"; -import type { structure } from "../../apiStructure/sammoRootAPI"; -import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs"; -import { declProcDecorators } from "../ProcDecorator/base"; +import { GET } from "../defs.js"; +import type { structure } from "../../apiStructure/sammoRootAPI.js"; +import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs.js"; +import { declProcDecorators } from "../ProcDecorator/base.js"; +import { ReqLogin } from "../ProcDecorator/ReqLogin.js"; +import { StartSession } from "../ProcDecorator/StartSession.js"; type BaseAPI = typeof structure.Login.ReqNonce; type RType = ExtractResponse; @@ -11,7 +13,10 @@ const argValidator = undefined; export const ReqNonce = GET (argValidator) - (declProcDecorators([] as const)) - (() => { + (declProcDecorators([ + StartSession, + ReqLogin, + ] as const)) + ((query, ctx) => { throw new Error("Method not implemented."); }); \ No newline at end of file diff --git a/server/api/Login/LoginByID.ts b/server/api/Login/LoginByID.ts index b9dfa75..c1b2f7b 100644 --- a/server/api/Login/LoginByID.ts +++ b/server/api/Login/LoginByID.ts @@ -1,10 +1,10 @@ -import { POST } from "../defs"; -import type { structure } from "../../apiStructure/sammoRootAPI"; -import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs"; -import { StartSession } from "../ProcDecorator/StartSession"; +import { POST } from "../defs.js"; +import type { structure } from "../../apiStructure/sammoRootAPI.js"; +import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs.js"; +import { StartSession } from "../ProcDecorator/StartSession.js"; import { IsString } from "class-validator"; -import { delay } from "../../util/delay"; -import { declProcDecorators } from "../ProcDecorator/base"; +import { delay } from "../../util/delay.js"; +import { declProcDecorators } from "../ProcDecorator/base.js"; type BaseAPI = typeof structure.Login.LoginByID; type RType = ExtractResponse; diff --git a/server/api/Login/LoginByToken.ts b/server/api/Login/LoginByToken.ts index 156cd38..f637eb4 100644 --- a/server/api/Login/LoginByToken.ts +++ b/server/api/Login/LoginByToken.ts @@ -1,10 +1,10 @@ -import { POST } from "../defs"; -import type { structure } from "../../apiStructure/sammoRootAPI"; -import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs"; -import { StartSession } from "../ProcDecorator/StartSession"; +import { POST } from "../defs.js"; +import type { structure } from "../../apiStructure/sammoRootAPI.js"; +import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs.js"; +import { StartSession } from "../ProcDecorator/StartSession.js"; import { IsNumber, IsString } from "class-validator"; -import { delay } from "../../util/delay"; -import { PackChain, ParseInType, ParseOutType, declProcDecorators } from "../ProcDecorator/base"; +import { delay } from "../../util/delay.js"; +import { declProcDecorators } from "../ProcDecorator/base.js"; type BaseAPI = typeof structure.Login.LoginByToken; type RType = ExtractResponse; type EType = ExtractError; diff --git a/server/api/Login/ReqNonce.ts b/server/api/Login/ReqNonce.ts index 17b390c..6bbf168 100644 --- a/server/api/Login/ReqNonce.ts +++ b/server/api/Login/ReqNonce.ts @@ -1,8 +1,8 @@ -import { GET } from "../defs"; -import type { structure } from "../../apiStructure/sammoRootAPI"; -import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs"; -import { StartSession } from "../ProcDecorator/StartSession"; -import { declProcDecorators } from "../ProcDecorator/base"; +import { GET } from "../defs.js"; +import type { structure } from "../../apiStructure/sammoRootAPI.js"; +import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs.js"; +import { StartSession } from "../ProcDecorator/StartSession.js"; +import { declProcDecorators } from "../ProcDecorator/base.js"; type BaseAPI = typeof structure.Login.ReqNonce; type RType = ExtractResponse; diff --git a/server/api/Login/index.ts b/server/api/Login/index.ts index 5ee8352..01b76bc 100644 --- a/server/api/Login/index.ts +++ b/server/api/Login/index.ts @@ -1,9 +1,9 @@ -import type { structure } from "../../apiStructure/sammoRootAPI"; -import type { APINamespaceType } from "../defs"; -import { LoginByID } from "./LoginByID"; -import { LoginByToken } from "./LoginByToken"; -import { ReqNonce } from "./ReqNonce"; -import { test } from "./test"; +import type { structure } from "../../apiStructure/sammoRootAPI.js"; +import type { APINamespaceType } from "../defs.js"; +import { LoginByID } from "./LoginByID.js"; +import { LoginByToken } from "./LoginByToken.js"; +import { ReqNonce } from "./ReqNonce.js"; +import { test } from "./test.js"; export const Login = { LoginByID, diff --git a/server/api/Login/test.ts b/server/api/Login/test.ts index e3fe590..8b50b72 100644 --- a/server/api/Login/test.ts +++ b/server/api/Login/test.ts @@ -1,7 +1,7 @@ -import { GET } from "../defs"; -import type { structure } from "../../apiStructure/sammoRootAPI"; -import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs"; -import { declProcDecorators } from "../ProcDecorator/base"; +import { GET } from "../defs.js"; +import type { structure } from "../../apiStructure/sammoRootAPI.js"; +import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs.js"; +import { declProcDecorators } from "../ProcDecorator/base.js"; type BaseAPI = typeof structure.Login.test; type RType = ExtractResponse; diff --git a/server/api/ProcDecorator/ParseUserLevel.ts b/server/api/ProcDecorator/ParseUserLevel.ts index 15a6ee0..8ab8fb3 100644 --- a/server/api/ProcDecorator/ParseUserLevel.ts +++ b/server/api/ProcDecorator/ParseUserLevel.ts @@ -1,6 +1,6 @@ -import type { LoginCtx } from "./ReqLogin"; -import type { SessionCtx } from "./StartSession"; -import type { ProcDecoratorGenerator } from "./base"; +import type { LoginCtx } from "./ReqLogin.js"; +import type { SessionCtx } from "./StartSession.js"; +import type { ProcDecoratorGenerator } from "./base.js"; import type { Request, Response } from "express"; diff --git a/server/api/ProcDecorator/ReqGameLogin.ts b/server/api/ProcDecorator/ReqGameLogin.ts index ff14636..af22a6c 100644 --- a/server/api/ProcDecorator/ReqGameLogin.ts +++ b/server/api/ProcDecorator/ReqGameLogin.ts @@ -1,6 +1,6 @@ -import type { LoginCtx } from "./ReqLogin"; -import type { SessionCtx } from "./StartSession"; -import type { ProcDecoratorGenerator } from "./base"; +import type { LoginCtx } from "./ReqLogin.js"; +import type { SessionCtx } from "./StartSession.js"; +import type { ProcDecoratorGenerator } from "./base.js"; import type { Request, Response } from "express"; import { delay } from "../../util/delay.js"; diff --git a/server/api/ProcDecorator/ReqLogin.ts b/server/api/ProcDecorator/ReqLogin.ts index 5c0b29b..8ca25ed 100644 --- a/server/api/ProcDecorator/ReqLogin.ts +++ b/server/api/ProcDecorator/ReqLogin.ts @@ -1,5 +1,5 @@ -import type { SessionCtx } from "./StartSession"; -import type { DecoratorResultFalse, DecoratorResultTrue, ProcDecorator, ProcDecoratorGenerator } from "./base"; +import type { SessionCtx } from "./StartSession.js"; +import type { DecoratorResultFalse, DecoratorResultTrue, ProcDecorator, ProcDecoratorGenerator } from "./base.js"; export type LoginCtx = { userID: number; diff --git a/server/api/ProcDecorator/StartSession.ts b/server/api/ProcDecorator/StartSession.ts index e7b57f5..081e30d 100644 --- a/server/api/ProcDecorator/StartSession.ts +++ b/server/api/ProcDecorator/StartSession.ts @@ -1,4 +1,4 @@ -import type { Empty, ProcDecoratorGenerator } from "./base"; +import type { Empty, ProcDecoratorGenerator } from "./base.js"; export type SessionCtx = { clearSession: () => Promise; diff --git a/server/api/defs.ts b/server/api/defs.ts index 8d6b2dc..600dfe9 100644 --- a/server/api/defs.ts +++ b/server/api/defs.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express'; -import type { Callable, DefAPINamespace, DeleteAPICallT, GetAPICallT, HeadAPICallT, HttpMethod, InvalidResponse, PatchAPICallT, PostAPICallT, PutAPICallT, RawArgType, ValidResponse, recoveryMethod } from '../apiStructure/defs'; +import type { Callable, DefAPINamespace, DeleteAPICallT, GetAPICallT, HeadAPICallT, HttpMethod, InvalidResponse, PatchAPICallT, PostAPICallT, PutAPICallT, RawArgType, ValidResponse, recoveryMethod } from '../apiStructure/defs.js'; import { validate, type ValidatorOptions, diff --git a/server/api/root.ts b/server/api/root.ts index ebb2f4c..c9263f6 100644 --- a/server/api/root.ts +++ b/server/api/root.ts @@ -1,6 +1,6 @@ -import type { structure } from "../apiStructure/sammoRootAPI"; -import type { APINamespaceType } from "./defs"; -import { Login } from "./Login"; +import type { structure } from "../apiStructure/sammoRootAPI.js"; +import type { APINamespaceType } from "./defs.js"; +import { Login } from "./Login/index.js"; export const sammoRootAPI = { Login, diff --git a/server/apiStructure/sammoRootAPI.ts b/server/apiStructure/sammoRootAPI.ts index 21363ed..8279692 100644 --- a/server/apiStructure/sammoRootAPI.ts +++ b/server/apiStructure/sammoRootAPI.ts @@ -1,4 +1,4 @@ -import { type DefAPINamespace, GET, POST } from "./defs"; +import { type DefAPINamespace, GET, POST } from "./defs.js"; export type LoginResponse = { result: true, diff --git a/server/clientAPI/generator.ts b/server/clientAPI/generator.ts index 2d7ced4..d802bf4 100644 --- a/server/clientAPI/generator.ts +++ b/server/clientAPI/generator.ts @@ -1,7 +1,7 @@ import isArray from "lodash-es/isArray"; import isEmpty from "lodash-es/isEmpty"; import ky from "ky"; -import type { HttpMethod, InvalidResponse, RawArgType, ValidResponse } from "../apiStructure/defs"; +import type { HttpMethod, InvalidResponse, RawArgType, ValidResponse } from "../apiStructure/defs.js"; export async function callClientAPI( method: HttpMethod, diff --git a/server/clientAPI/sammoRootAPI.ts b/server/clientAPI/sammoRootAPI.ts index 6498247..1b1dcd1 100644 --- a/server/clientAPI/sammoRootAPI.ts +++ b/server/clientAPI/sammoRootAPI.ts @@ -1,7 +1,7 @@ -import { APIPathGen } from "./APIPathGen"; -import type { APITail, RawArgType } from "../apiStructure/defs"; -import { structure } from "../apiStructure/sammoRootAPI"; -import { callClientAPI } from "./generator"; +import { APIPathGen } from "./APIPathGen.js"; +import type { APITail, RawArgType } from "../apiStructure/defs.js"; +import { structure } from "../apiStructure/sammoRootAPI.js"; +import { callClientAPI } from "./generator.js"; const apiRoot = process.env.API_ROOT_PATH ?? process.env.VITE_API_ROOT_PATH ?? '/rootAPI'; diff --git a/server/util/RandUtil.ts b/server/util/RandUtil.ts index f662114..56a8af7 100644 --- a/server/util/RandUtil.ts +++ b/server/util/RandUtil.ts @@ -1,4 +1,4 @@ -import type { RNG } from './RNG'; +import type { RNG } from './RNG.js'; export class RandUtil { constructor(protected rng: RNG) { diff --git a/server/util/convertIDArray.ts b/server/util/convertIDArray.ts index 8b7a609..972ff2a 100644 --- a/server/util/convertIDArray.ts +++ b/server/util/convertIDArray.ts @@ -1,4 +1,4 @@ -import type { IDItem } from './defs'; +import type { IDItem } from './defs.js'; export function convertIDArray(array: Iterable): IDItem[] { const result: IDItem[] = []; diff --git a/server/util/getDateTimeNow.ts b/server/util/getDateTimeNow.ts index 152f280..442d6e7 100644 --- a/server/util/getDateTimeNow.ts +++ b/server/util/getDateTimeNow.ts @@ -1,4 +1,4 @@ -import { formatTime } from './/formatTime'; +import { formatTime } from './formatTime.js'; export function getDateTimeNow(withFraction = false): string { return formatTime(new Date(), withFraction); } \ No newline at end of file