devsam/core_ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

대충이런느낌

Browse Source
This commit is contained in:
Hide_D
2023-08-08 17:10:15 +00:00
parent c7d0702e66
commit e381dd5a7e
10 changed files with 296 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/api/Login/ChangePassword.ts
+16
View File
@@ -0,0 +1,16 @@
import { ngGET } from "../defs";
import type { structure } from "../../apiStructure/sammoRootAPI";
import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs";
type BaseAPI = typeof structure.Login.ReqNonce;
type RType = ExtractResponse<BaseAPI>;
type EType = ExtractError<BaseAPI>;
type QType = ExtractQuery<BaseAPI>;
const argValidator = undefined;
const procDecorator = [] as const;
export const ReqNonce = ngGET<RType, EType, QType>(argValidator)(procDecorator)(
(query, ctx, req, res) => {
throw new Error("Method not implemented.");
}
);
server/api/Login/LoginByID.ts
+42 -11
View File
@@ -1,24 +1,55 @@
import { POST } from "../defs";
import { POST, ngPOST } from "../defs";
import type { structure } from "../../apiStructure/sammoRootAPI";
import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs";
import { StartSession } from "../ProcDecorator/StartSession";
import { IsString } from "class-validator";
import { delay } from "../../util/delay";
type BaseAPI = typeof structure.Login.LoginByID;
type RType = ExtractResponse<BaseAPI>;
type EType = ExtractError<BaseAPI>;
type QType = ExtractQuery<BaseAPI>;
class Q implements QType {
class ArgValidator implements QType {
@IsString()
username!: string;
@IsString()
password!: string;
}
const procDecorator = [
StartSession,
] as const;
const procDecorator = [] as const;
export const LoginByID = ngPOST<RType, EType, QType>(ArgValidator)(procDecorator)(
async (query, ctx, req, res) => {
const username = query.username;
const password = query.password;
export class LoginByID extends POST<RType, EType, QType, typeof procDecorator>{
readonly argValidator = Q;
readonly procDecorator = procDecorator;
protected LoginByID = Symbol("LoginByID");//TODO: remove this
protected override async api(query: QType, ctx,): Promise<RType | EType | true> {
throw new Error("Method not implemented.");
//TODO: DB에서 뭔가 가져와야 함
await delay(1);
if(Math.random() < 0.3){
return {
result: false,
reason: "로그인 실패",
reqOTP: false,
}
}
if(Math.random() < 0.5){
return {
result: false,
reason: "OTP 인증 필요",
reqOTP: true,
}
}
const userID = 1;
const nextToken: [number, string] = [1, "1234567890"];
await ctx.setValue("userID", userID);
return {
result: true,
nextToken,
}
}
}
);
server/api/Login/LoginByToken.ts
+34 -8
View File
@@ -1,16 +1,42 @@
import { POST } from "../defs";
import { ngPOST } from "../defs";
import type { structure } from "../../apiStructure/sammoRootAPI";
import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs";
import { StartSession } from "../ProcDecorator/StartSession";
import { IsNumber, IsString } from "class-validator";
import { delay } from "../../util/delay";
type BaseAPI = typeof structure.Login.LoginByToken;
type RType = ExtractResponse<BaseAPI>;
type EType = ExtractError<BaseAPI>;
type QType = ExtractQuery<BaseAPI>;
class ArgValidator implements QType {
@IsNumber()
token_id!: number;
@IsString()
hashedToken!: string;
}
const procDecorator = [
StartSession,
] as const;
export const LoginByToken = ngPOST<RType, EType, QType>(ArgValidator)(procDecorator)(
async (query, ctx) => {
query.hashedToken;
ctx.clearSession();
await delay(1);
//무언가 로그인
//TODO: DB는 어디서 들고옴?
const userID = 1;
const nextToken: [number, string] = [1, "1234567890"];
await ctx.setValue("userID", userID);
//throw new Error("Method not implemented.");
return {
result: true,
nextToken,
}
export class LoginByToken extends POST<RType, EType, QType>{
readonly argValidator = undefined;
protected LoginByToken = Symbol("LoginByToken");//TODO: remove this
protected override async api(query: QType): Promise<RType | EType | true> {
throw new Error("Method not implemented.");
}
}
);
server/api/Login/ReqNonce.ts
+26 -14
View File
@@ -1,23 +1,35 @@
import { ngGET } from "../defs";
import { APINamespace, APINamespaceType, ngGET } from "../defs";
import type { structure } from "../../apiStructure/sammoRootAPI";
import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs";
import type { DefAPINamespace, ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs";
import { StartSession } from "../ProcDecorator/StartSession";
type BaseAPI = typeof structure.Login.ReqNonce;
type RType = ExtractResponse<BaseAPI>;
type EType = ExtractError<BaseAPI>;
type QType = ExtractQuery<BaseAPI>;
const argValidator = undefined;
const procDecorator = [
StartSession,
] as const;
/*export class ReqNonce extends GET<RType, EType, QType>{
readonly argValidator = undefined;
readonly procDecorator = [] as const;
protected ReqNonce = Symbol("ReqNonce");//TODO: remove this
protected override async api(query: QType): Promise<RType | EType | true> {
throw new Error("Method not implemented.");
}
}*/
export const ReqNonce = ngGET<RType, EType, QType>(argValidator)(procDecorator)(
async (query, ctx) => {
const nonce = await ctx.getValue<string>("nonce");
if(nonce !== undefined){
return {
loginNonce: nonce,
result: true,
}
}
export const ReqNonce = ngGET<RType, EType, QType>(undefined)([] as const)(
(query, ctx, req, res) => {
throw new Error("Method not implemented.");
const newNonce = "1234567890";
await ctx.setValue("nonce", newNonce);
return {
loginNonce: newNonce,
result: true,
}
}
);
);
type BaseAPI2 = APINamespaceType<typeof structure.Login>['ReqNonce'];
type A = typeof ReqNonce;
server/api/Login/test.ts
+5 -10
View File
@@ -1,4 +1,4 @@
import { GET } from "../defs";
import { GET, ngGET } from "../defs";
import type { structure } from "../../apiStructure/sammoRootAPI";
import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs";
@@ -7,13 +7,8 @@ type RType = ExtractResponse<BaseAPI>;
type EType = ExtractError<BaseAPI>;
type QType = ExtractQuery<BaseAPI>;
export class test extends GET<RType, EType, QType>{
readonly argValidator = undefined;
protected ReqNonce = Symbol("ReqNonce");//TODO: remove this
protected override async api(query: QType): Promise<RType | EType | true> {
return {
hello: "world",
result: true,
}
export const test = ngGET<RType, EType, QType>(undefined)(undefined)(
(query, ctx, req, res) => {
throw new Error("Method not implemented.");
}
}
);
server/api/ProcDecorator/ParseUserLevel.ts
+5 -2
View File
@@ -1,4 +1,5 @@
import { LoginCtx } from "./ReqLogin";
import { SessionCtx } from "./StartSession";
import type { ProcDecoratorGenerator } from "./base";
import type { Request, Response } from "express";
@@ -7,10 +8,12 @@ export interface UserLevelCtx {
userLevel: number;
}
export function ParseUserLevel<Q extends LoginCtx>(): ProcDecoratorGenerator<UserLevelCtx, Q> {
export function ParseUserLevel<Q extends LoginCtx & SessionCtx>(): ProcDecoratorGenerator<UserLevelCtx, Q> {
return (inCtx) => {
const userLevel = 123;
inCtx.setValue('userLevel', userLevel);
return {
userLevel: 123,
userLevel,
...inCtx,
}
}
server/api/ProcDecorator/ReqGameLogin.ts
+18 -3
View File
@@ -1,15 +1,30 @@
import { LoginCtx } from "./ReqLogin";
import { SessionCtx } from "./StartSession";
import type { ProcDecoratorGenerator } from "./base";
import type { Request, Response } from "express";
import { delay } from "../../util/delay.js";
export type GameLoginCtx = {
generalID: number;
}
export function ReqGameLogin<Q extends LoginCtx>(): ProcDecoratorGenerator<GameLoginCtx, Q> {
return (inCtx) => {
export function ReqGameLogin<Q extends LoginCtx & SessionCtx>(): ProcDecoratorGenerator<GameLoginCtx, Q> {
return async (inCtx) => {
const ctx: Q & Partial<GameLoginCtx> = inCtx;
if (ctx.generalID !== undefined) {
return {
generalID: ctx.generalID,
...inCtx,
};
}
console.log('Something GameLogin');
await delay(0);
inCtx.setValue('generalID', ctx.userID * 4);
return {
generalID: inCtx.userID * 4,
generalID: ctx.userID * 4,
...inCtx,
}
}
server/api/ProcDecorator/ReqLogin.ts
+15 -12
View File
@@ -1,20 +1,23 @@
import type { Empty, ProcDecoratorPrePostGenerator } from "./base";
import { SessionCtx } from "./StartSession";
import type { InvalidProc, ProcDecoratorGenerator } from "./base";
export type LoginCtx = {
userID: number;
}
export function ReqLogin<Q extends object = Empty>(): ProcDecoratorPrePostGenerator<LoginCtx, Q> {
return [
(inCtx) => {
export function ReqLogin<Q extends SessionCtx>(): ProcDecoratorGenerator<LoginCtx, Q> {
return (inCtx) => {
const ctx: Q & Partial<LoginCtx> = inCtx;
const userID = ctx.userID;
if (userID === undefined) {
return {
userID: 999,
...inCtx,
};
},
(inCtx) => {
console.log('ReqLogin post');
return inCtx;
result: false,
reason: 'Required Login',
invalidProcSymbol: 'ReqLogin'
} satisfies InvalidProc;
}
]
return ctx as LoginCtx & Q;
}
}
server/api/ProcDecorator/StartSession.ts
+39
View File
@@ -0,0 +1,39 @@
import type { Empty, ProcDecoratorGenerator } from "./base";
export type SessionCtx = {
clearSession: () => Promise<void>;
deleteValue: (key: string) => Promise<void>;
getValue: <T>(key: string) => Promise<T | undefined>;
setValue: (key: string, value: unknown) => Promise<void>;
sessionRaw: {
raw: object;
changed: boolean;
};
}
export function StartSession<Q extends object = Empty>(): ProcDecoratorGenerator<SessionCtx, Q> {
return (inCtx) => {
const raw: object = {};
return {
clearSession: () => Promise.resolve(),
deleteValue: async (key: string) => {
console.log('deleteValue', key);
if (raw[key] !== undefined) {
delete raw[key];
}
},
getValue: async <T>(key: string) => {
return raw[key] as T | undefined;
},
setValue: async (key: string, value: unknown) => {
console.log('setValue', key, value);
raw[key] = value;
},
sessionRaw: {
raw,
changed: false,
},
...inCtx,
};
}
}
server/api/defs.ts
+96 -34
View File
@@ -94,14 +94,14 @@ export abstract class APIExecuter<R extends ValidResponse, E extends InvalidResp
}
let isValidRoute = true;
if(index !== -1 && index !== this.postDecorator.length){
if (index !== -1 && index !== this.postDecorator.length) {
isValidRoute = false;
index = clamp(index, 0, this.postDecorator.length);
}
for (let i = index - 1; i >= 0; i--) {
const proc = this.postDecorator[i];
if(!proc){
if (!proc) {
continue;
}
@@ -131,7 +131,7 @@ export abstract class APIExecuter<R extends ValidResponse, E extends InvalidResp
const ctx = await this.preCtx(expressReq, expressRes);
if (Array.isArray(ctx)) {
const [invalidProc, errCtx, idx] = ctx;
if (idx == 0){
if (idx == 0) {
expressRes.json(invalidProc);
return;
}
@@ -147,7 +147,7 @@ export abstract class APIExecuter<R extends ValidResponse, E extends InvalidResp
const result = await this.api(query, ctx, expressReq, expressRes);
const postResult = await this.postCtx(ctx, expressReq, expressRes);
if (postResult !== undefined) {
if(result === true){
if (result === true) {
//NOTE: 이미 api에서 response를 보낸 특이 케이스.
return;
}
@@ -163,7 +163,7 @@ export abstract class APIExecuter<R extends ValidResponse, E extends InvalidResp
}
}
interface ngAPIExecuter<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain>{
interface ngAPIExecuter<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> {
(query: Q, ctx: ResolveChain<PD>, expressReq: Request, expressRes: Response): Promise<R | E | true>;
httpMethod: HttpMethod;
argValidator?: ValidatorType<Q>;
@@ -171,19 +171,38 @@ interface ngAPIExecuter<R extends ValidResponse, E extends InvalidResponse, Q ex
postDecorator: (ProcDecorator<any, any> | undefined)[];
}
interface ngAPIGenerator<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType>{
<PD extends ProcDecoratorChain>(procDecoratorChain: PD): ngAPIExecuter<R, E, Q, PD>;
export interface iAPI_GET<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> extends ngAPIExecuter<R, E, Q, PD> {
httpMethod: 'get';
}
function ngGenerateAPI<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain>(httpMethod: HttpMethod, args: {
argValidator?: ValidatorType<Q>,
export interface iAPI_POST<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> extends ngAPIExecuter<R, E, Q, PD> {
httpMethod: 'post';
}
export interface iAPI_PUT<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> extends ngAPIExecuter<R, E, Q, PD> {
httpMethod: 'put';
}
export interface iAPI_DELETE<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> extends ngAPIExecuter<R, E, Q, PD> {
httpMethod: 'delete';
}
export interface iAPI_PATCH<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> extends ngAPIExecuter<R, E, Q, PD> {
httpMethod: 'patch';
}
export interface iAPI_HEAD<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> extends ngAPIExecuter<R, E, Q, PD> {
httpMethod: 'head';
}
function ngGenerateAPI<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain>(httpMethod: HttpMethod,
argValidator: ValidatorType<Q> | undefined,
procDecoratorChain: PD,
callback: (query: Q, ctx: ResolveChain<PD>, expressReq: Request, expressRes: Response) => Promise<R | E | true>,
}): ngAPIExecuter<R, E, Q, PD>{
const { argValidator, procDecoratorChain, callback } = args;
): ngAPIExecuter<R, E, Q, PD> {
const preDecorator: ProcDecorator<any, any>[] = [];
const postDecorator: (ProcDecorator<any, any> | undefined)[] = [];
if(procDecoratorChain){
if (procDecoratorChain) {
for (const procGen of procDecoratorChain) {
const proc = procGen();
if (Array.isArray(proc)) {
@@ -208,41 +227,84 @@ function ngGenerateAPI<R extends ValidResponse, E extends InvalidResponse, Q ext
);
}
export function ngGET<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType>(argValidator?: ValidatorType<Q>){
export function ngGET<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType>(argValidator?: ValidatorType<Q>) {
return <PD extends ProcDecoratorChain>(procDecoratorChain: PD) => {
return (callback: (query: Q, ctx: ResolveChain<PD>, expressReq: Request, expressRes: Response) => Promise<R | E | true>) => {
return ngGenerateAPI<R, E, Q, PD>('get', {
return ngGenerateAPI<R, E, Q, PD>(
'get',
argValidator,
procDecoratorChain,
callback,
});
) as iAPI_GET<R, E, Q, PD>;
}
}
}
interface ngGET<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> extends ngAPIExecuter<R, E, Q, PD>{
httpMethod: 'get';
export function ngPOST<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType>(argValidator?: ValidatorType<Q>) {
return <PD extends ProcDecoratorChain>(procDecoratorChain: PD) => {
return (callback: (query: Q, ctx: ResolveChain<PD>, expressReq: Request, expressRes: Response) => Promise<R | E | true>) => {
return ngGenerateAPI<R, E, Q, PD>(
'post',
argValidator,
procDecoratorChain,
callback,
) as iAPI_POST<R, E, Q, PD>;
}
}
}
interface ngPOST<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> extends ngAPIExecuter<R, E, Q, PD>{
httpMethod: 'post';
export function ngPUT<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType>(argValidator?: ValidatorType<Q>) {
return <PD extends ProcDecoratorChain>(procDecoratorChain: PD) => {
return (callback: (query: Q, ctx: ResolveChain<PD>, expressReq: Request, expressRes: Response) => Promise<R | E | true>) => {
return ngGenerateAPI<R, E, Q, PD>(
'put',
argValidator,
procDecoratorChain,
callback,
) as iAPI_PUT<R, E, Q, PD>;
}
}
}
interface ngPUT<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> extends ngAPIExecuter<R, E, Q, PD>{
httpMethod: 'put';
export function ngDELETE<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType>(argValidator?: ValidatorType<Q>) {
return <PD extends ProcDecoratorChain>(procDecoratorChain: PD) => {
return (callback: (query: Q, ctx: ResolveChain<PD>, expressReq: Request, expressRes: Response) => Promise<R | E | true>) => {
return ngGenerateAPI<R, E, Q, PD>(
'delete',
argValidator,
procDecoratorChain,
callback,
) as iAPI_DELETE<R, E, Q, PD>;
}
}
}
interface ngDELETE<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> extends ngAPIExecuter<R, E, Q, PD>{
httpMethod: 'delete';
export function ngPATCH<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType>(argValidator?: ValidatorType<Q>) {
return <PD extends ProcDecoratorChain>(procDecoratorChain: PD) => {
return (callback: (query: Q, ctx: ResolveChain<PD>, expressReq: Request, expressRes: Response) => Promise<R | E | true>) => {
return ngGenerateAPI<R, E, Q, PD>(
'patch',
argValidator,
procDecoratorChain,
callback,
) as iAPI_PATCH<R, E, Q, PD>;
}
}
}
interface ngPATCH<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> extends ngAPIExecuter<R, E, Q, PD>{
httpMethod: 'patch';
export function ngHEAD<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType>(argValidator?: ValidatorType<Q>) {
return <PD extends ProcDecoratorChain>(procDecoratorChain: PD) => {
return (callback: (query: Q, ctx: ResolveChain<PD>, expressReq: Request, expressRes: Response) => Promise<R | E | true>) => {
return ngGenerateAPI<R, E, Q, PD>(
'head',
argValidator,
procDecoratorChain,
callback,
) as iAPI_HEAD<R, E, Q, PD>;
}
}
}
interface ngHEAD<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> extends ngAPIExecuter<R, E, Q, PD>{
httpMethod: 'head';
}
export abstract class APIBodyParseExecuter<R extends ValidResponse, E extends InvalidResponse, Q extends RawArgType, PD extends ProcDecoratorChain> extends APIExecuter<R, E, Q, PD>{
@@ -321,17 +383,17 @@ export type ClassType<T> = new (...args: any[]) => T;
export type APIServerType<T extends Callable> =
// eslint-disable-next-line @typescript-eslint/no-explicit-any
T extends GetAPICallT<infer Q, infer R, infer E> ? ClassType<GET<R, E, Q, any>> :
T extends GetAPICallT<infer Q, infer R, infer E> ? iAPI_GET<R, E, Q, any> :
// eslint-disable-next-line @typescript-eslint/no-explicit-any
T extends PostAPICallT<infer Q, infer R, infer E> ? ClassType<POST<R, E, Q, any>> :
T extends PostAPICallT<infer Q, infer R, infer E> ? iAPI_POST<R, E, Q, any> :
// eslint-disable-next-line @typescript-eslint/no-explicit-any
T extends PutAPICallT<infer Q, infer R, infer E> ? ClassType<PUT<R, E, Q, any>> :
T extends PutAPICallT<infer Q, infer R, infer E> ? iAPI_PUT<R, E, Q, any> :
// eslint-disable-next-line @typescript-eslint/no-explicit-any
T extends DeleteAPICallT<infer Q, infer R, infer E> ? ClassType<DELETE<R, E, Q, any>> :
T extends DeleteAPICallT<infer Q, infer R, infer E> ? iAPI_DELETE<R, E, Q, any> :
// eslint-disable-next-line @typescript-eslint/no-explicit-any
T extends PatchAPICallT<infer Q, infer R, infer E> ? ClassType<PATCH<R, E, Q, any>> :
T extends PatchAPICallT<infer Q, infer R, infer E> ? iAPI_PATCH<R, E, Q, any> :
// eslint-disable-next-line @typescript-eslint/no-explicit-any
T extends HeadAPICallT<infer Q, infer R, infer E> ? ClassType<HEAD<R, E, Q, any>> :
T extends HeadAPICallT<infer Q, infer R, infer E> ? iAPI_HEAD<R, E, Q, any> :
never;
export type APINamespaceType<T extends DefAPINamespace> = {
[K in keyof T]: