tiramisu/seyfert
5
0
Fork 0
mirror of https://github.com/tiramisulabs/seyfert.git synced 2025-07-02 04:56:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: useUWS httpConnection option

Browse Source
This commit is contained in:
MARCROCK22 2024-05-12 16:07:26 -04:00
parent b5bb4ed45d
commit 52e03c2cb0
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/base.ts
View File

@ -404,7 +404,11 @@ export interface StartOptions {
commandsDir: string;
componentsDir: string;
connection: { intents: number };
httpConnection: { publicKey: string; port: number };
httpConnection: {
publicKey: string;
port: number;
useUWS: boolean;
};
token: string;
}

19
src/client/httpclient.ts
View File

@ -8,7 +8,7 @@ import { filetypeinfo } from 'magic-bytes.js';
import type { HttpRequest, HttpResponse } from 'uWebSockets.js';
import { OverwrittenMimeTypes } from '../api';
import { isBufferLike } from '../api/utils/utils';
import { isCloudfareWorker, type DeepPartial } from '../common';
import { MergeOptions, isCloudfareWorker, type DeepPartial } from '../common';
import type { BaseClientOptions, InternalRuntimeConfigHTTP, StartOptions } from './base';
import { BaseClient } from './base';
import { onInteractionCreate } from './oninteractioncreate';
@ -29,7 +29,7 @@ try {
}
export class HttpClient extends BaseClient {
app!: ReturnType<typeof import('uWebSockets.js').App>;
app?: ReturnType<typeof import('uWebSockets.js').App>;
publicKey!: string;
publicKeyHex!: Buffer;
@ -66,7 +66,7 @@ export class HttpClient extends BaseClient {
});
}
protected async execute(options?: { publicKey?: string; port?: number }) {
protected async execute(options: DeepPartial<StartOptions['httpConnection']>) {
await super.execute();
const {
publicKey: publicKeyRC,
@ -74,8 +74,8 @@ export class HttpClient extends BaseClient {
applicationId: applicationIdRC,
} = await this.getRC<InternalRuntimeConfigHTTP>();
const publicKey = options?.publicKey ?? publicKeyRC;
const port = options?.port ?? portRC;
const publicKey = options.publicKey ?? publicKeyRC;
const port = options.port ?? portRC;
if (!publicKey) {
throw new Error('Expected a publicKey, check your config file');
@ -89,7 +89,7 @@ export class HttpClient extends BaseClient {
this.publicKey = publicKey;
this.publicKeyHex = Buffer.from(this.publicKey, 'hex');
if (UWS) {
if (UWS && options.useUWS) {
this.app = UWS.App();
this.app.post('/interactions', (res, req) => {
return this.onPacket(res, req);
@ -98,13 +98,16 @@ export class HttpClient extends BaseClient {
this.logger.info(`Listening to <url>:${port}/interactions`);
});
} else {
this.logger.warn('No UWS installed.');
if (options.useUWS) return this.logger.warn('No uWebSockets installed.');
this.logger.info('Use your preferred http server and invoke <HttpClient>.fetch(<Request>) to get started');
}
}
async start(options: DeepPartial<Omit<StartOptions, 'connection' | 'eventsDir'>> = {}) {
await super.start(options);
return this.execute(options.httpConnection);
return this.execute(
MergeOptions<DeepPartial<StartOptions['httpConnection']>>({ useUWS: true }, options.httpConnection),
);
}
protected async verifySignatureGenericRequest(req: Request) {

3
src/common/it/logger.ts
View File

@ -17,7 +17,7 @@ export type LoggerOptions = {
saveOnFile?: boolean;
};
export type CustomCallback = (self: Logger, level: LogLevels, args: unknown[]) => unknown[];
export type CustomCallback = (self: Logger, level: LogLevels, args: unknown[]) => unknown[] | undefined;
/**
* Represents a logger utility for logging messages with various log levels.
@ -142,6 +142,7 @@ export class Logger {
} else {
log = Logger.__callback(this, level, args);
}
if (!log) return;
this.__write(log);
return console.log(...log);
}