mirror of
https://github.com/sern-handler/tools
synced 2026-06-28 02:32:22 +00:00
merge w main
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -9,4 +9,5 @@
|
||||
.yarn/cache
|
||||
#.pnp.*
|
||||
node_modules/**/*
|
||||
packages/ioc/node_modules/*
|
||||
packages/poster/dts/discord.d.ts
|
||||
|
||||
18
packages/ioc/package.json
Normal file
18
packages/ioc/package.json
Normal file
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"name": "@sern/ioc",
|
||||
"version": "1.0.0",
|
||||
"description": "Dependency Injection system",
|
||||
"main": "dist/index.js",
|
||||
"scripts": {
|
||||
"test": "vitest"
|
||||
},
|
||||
"devDependencies": {
|
||||
"vitest": "^1.0.0"
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"publishConfig": {
|
||||
"access": "public"
|
||||
}
|
||||
}
|
||||
74
packages/ioc/src/container.ts
Normal file
74
packages/ioc/src/container.ts
Normal file
@@ -0,0 +1,74 @@
|
||||
|
||||
function hasCallableMethod(obj: object, name: PropertyKey) {
|
||||
//@ts-ignore
|
||||
return Object.hasOwn(obj, name) && typeof obj[name] == 'function';
|
||||
}
|
||||
/**
|
||||
* A Depedency injection container capable of adding singletons, firing hooks, and managing IOC within an application
|
||||
*/
|
||||
export class Container {
|
||||
private __singletons = new Map<PropertyKey, any>();
|
||||
private hooks= new Map<string, Function[]>();
|
||||
private finished_init = false;
|
||||
constructor(options: { autowire: boolean; path?: string }) {
|
||||
if(options.autowire) { /* noop */ }
|
||||
}
|
||||
|
||||
addHook(name: string, callback: Function) {
|
||||
if (!this.hooks.has(name)) {
|
||||
this.hooks.set(name, []);
|
||||
}
|
||||
this.hooks.get(name)!.push(callback);
|
||||
}
|
||||
private registerHooks(hookname: string, insert: object) {
|
||||
if(hasCallableMethod(insert, hookname)) {
|
||||
console.log(hookname)
|
||||
//@ts-ignore
|
||||
this.addHook(hookname, async () => await insert[hookname]())
|
||||
}
|
||||
}
|
||||
addSingleton(key: string, insert: object) {
|
||||
if(typeof insert !== 'object') {
|
||||
throw Error("Inserted object must be an object");
|
||||
}
|
||||
if(!this.__singletons.has(key)){
|
||||
this.registerHooks('init', insert)
|
||||
this.registerHooks('dispose', insert)
|
||||
this.__singletons.set(key, insert);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
addWiredSingleton(key: string, fn: (c: Container) => object) {
|
||||
const insert = fn(this);
|
||||
return this.addSingleton(key, insert);
|
||||
}
|
||||
|
||||
async disposeAll() {
|
||||
await this.executeHooks('dispose');
|
||||
this.hooks.delete('dispose');
|
||||
}
|
||||
|
||||
isReady() { return this.finished_init; }
|
||||
hasKey(key: string) { return this.__singletons.has(key); }
|
||||
get<T>(key: PropertyKey) : T|undefined { return this.__singletons.get(key); }
|
||||
|
||||
async ready() {
|
||||
await this.executeHooks('init');
|
||||
this.hooks.delete('init');
|
||||
this.finished_init = true;
|
||||
}
|
||||
|
||||
deps<T extends Record<string,any>>(): T {
|
||||
return Object.fromEntries(this.__singletons) as T
|
||||
}
|
||||
|
||||
async executeHooks(name: string) {
|
||||
const hookFunctions = this.hooks.get(name) || [];
|
||||
for (const hookFunction of hookFunctions) {
|
||||
await hookFunction();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
75
packages/ioc/src/global.ts
Normal file
75
packages/ioc/src/global.ts
Normal file
@@ -0,0 +1,75 @@
|
||||
import { Container } from './container';
|
||||
|
||||
//SIDE EFFECT: GLOBAL DI
|
||||
let containerSubject: Container;
|
||||
|
||||
/**
|
||||
* Don't use this unless you know what you're doing. Destroys old containerSubject if it exists and disposes everything
|
||||
* then it will swap
|
||||
*/
|
||||
export async function __swap_container(c: Container) {
|
||||
if(containerSubject) {
|
||||
await containerSubject.disposeAll()
|
||||
}
|
||||
containerSubject = c;
|
||||
}
|
||||
|
||||
/**
|
||||
* Don't use this unless you know what you're doing. Destroys old containerSubject if it exists and disposes everything
|
||||
* then it will swap
|
||||
*/
|
||||
export function __add_container(key: string, v: object) {
|
||||
containerSubject.addSingleton(key, v);
|
||||
}
|
||||
|
||||
/**
|
||||
* Initiates the global api.
|
||||
* Once this is finished, the Service api and the other global api is available
|
||||
*/
|
||||
export function __init_container(options: {
|
||||
autowire: boolean;
|
||||
path?: string | undefined;
|
||||
}) {
|
||||
containerSubject = new Container(options);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the underlying data structure holding all dependencies.
|
||||
* Exposes methods from iti
|
||||
* Use the Service API. The container should be readonly
|
||||
*/
|
||||
export function useContainerRaw() {
|
||||
if (!(containerSubject && containerSubject.isReady())) {
|
||||
throw new Error("Container wasn't ready or init'd. Please ensure container is ready()");
|
||||
}
|
||||
|
||||
return containerSubject;
|
||||
}
|
||||
|
||||
/**
|
||||
* The Service api, retrieve from the globally init'ed container
|
||||
* Note: this method only works AFTER your container has been initiated
|
||||
* @since 3.0.0
|
||||
* @example
|
||||
* ```ts
|
||||
* const client = Service('@sern/client');
|
||||
* ```
|
||||
* @param key a key that corresponds to a dependency registered.
|
||||
*
|
||||
*/
|
||||
export function Service<const T>(key: PropertyKey) {
|
||||
const dep = useContainerRaw().get<T>(key)!;
|
||||
if(!dep) {
|
||||
throw Error("Requested key " + String(key) + " returned undefined");
|
||||
}
|
||||
return dep;
|
||||
}
|
||||
/**
|
||||
* @since 3.0.0
|
||||
* The plural version of {@link Service}
|
||||
* @returns array of dependencies, in the same order of keys provided
|
||||
*/
|
||||
export function Services<const T extends string[], V>(...keys: [...T]) {
|
||||
const container = useContainerRaw();
|
||||
return keys.map(k => container.get(k)!) as V;
|
||||
}
|
||||
2
packages/ioc/src/index.ts
Normal file
2
packages/ioc/src/index.ts
Normal file
@@ -0,0 +1,2 @@
|
||||
export { Service, Services, __init_container, __add_container } from './global';
|
||||
export { Container } from './container'
|
||||
120
packages/ioc/test/index.test.ts
Normal file
120
packages/ioc/test/index.test.ts
Normal file
@@ -0,0 +1,120 @@
|
||||
|
||||
import { Container } from '../src/container';
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
||||
|
||||
describe('CoreContainer Tests', () => {
|
||||
let coreContainer: Container;
|
||||
|
||||
beforeEach(() => {
|
||||
coreContainer = new Container({ autowire: false });
|
||||
});
|
||||
|
||||
it('Adding and getting singletons', () => {
|
||||
coreContainer.addSingleton('singletonKey', { value: 'singletonValue' });
|
||||
const singleton = coreContainer.get('singletonKey');
|
||||
expect(singleton).toEqual({ value: 'singletonValue' });
|
||||
});
|
||||
|
||||
|
||||
it('Checking if container is ready', () => {
|
||||
expect(coreContainer.isReady()).toBe(false);
|
||||
coreContainer.ready().then(() => {
|
||||
expect(coreContainer.isReady()).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
it('Adding and getting singletons - async', async () => {
|
||||
await coreContainer.ready();
|
||||
coreContainer.addSingleton('asyncSingletonKey', { value: 'asyncSingletonValue' });
|
||||
const singleton = coreContainer.get('asyncSingletonKey');
|
||||
expect(singleton).toEqual({ value: 'asyncSingletonValue' });
|
||||
})
|
||||
it('Registering and executing hooks - init should be called once after ready', async () => {
|
||||
let initCount = 0;
|
||||
|
||||
const singletonWithInit = {
|
||||
value: 'singletonValueWithInit',
|
||||
init: async () => {
|
||||
initCount++;
|
||||
}
|
||||
};
|
||||
|
||||
coreContainer.addSingleton('singletonKeyWithInit', singletonWithInit);
|
||||
|
||||
// Call ready twice to ensure hooks are executed only once
|
||||
await coreContainer.ready();
|
||||
await coreContainer.ready();
|
||||
|
||||
expect(initCount).toBe(1);
|
||||
});
|
||||
|
||||
it('Registering and executing hooks - ', async () => {
|
||||
let initCount = 0;
|
||||
|
||||
const singletonWithInit = {
|
||||
value: 'singletonValueWithInit',
|
||||
init: async () => {
|
||||
initCount++;
|
||||
}
|
||||
};
|
||||
|
||||
coreContainer.addSingleton('singletonKeyWithInit', singletonWithInit);
|
||||
|
||||
// Call ready twice to ensure hooks are executed only once
|
||||
await coreContainer.ready();
|
||||
await coreContainer.ready();
|
||||
|
||||
expect(initCount).toBe(1);
|
||||
});
|
||||
|
||||
|
||||
it('wired singleton', async () => {
|
||||
let fn = vi.fn()
|
||||
const wiredSingletonFn = (container: Container) => {
|
||||
return { value: 'wiredSingletonValue', init: fn };
|
||||
};
|
||||
const added = coreContainer.addWiredSingleton('wiredSingletonKey', wiredSingletonFn);
|
||||
expect(added).toBe(true);
|
||||
const wiredSingleton = coreContainer.get('wiredSingletonKey');
|
||||
expect(wiredSingleton).toEqual({ value: 'wiredSingletonValue', init: fn });
|
||||
await coreContainer.ready()
|
||||
await coreContainer.ready()
|
||||
//@ts-ignore
|
||||
expect(wiredSingleton.init).toHaveBeenCalledOnce();
|
||||
})
|
||||
|
||||
it('dispose', async () => {
|
||||
let dfn = vi.fn()
|
||||
const wiredSingletonFn = { value: 'wiredSingletonValue', dispose: dfn };
|
||||
coreContainer.addSingleton('sk', wiredSingletonFn);
|
||||
|
||||
await coreContainer.disposeAll();
|
||||
|
||||
expect(dfn).toHaveBeenCalledOnce()
|
||||
})
|
||||
|
||||
it('Checking if container is ready', async () => {
|
||||
expect(coreContainer.isReady()).toBe(false);
|
||||
await coreContainer.ready();
|
||||
expect(coreContainer.isReady()).toBe(true);
|
||||
});
|
||||
it('Registering and executing hooks - init should be called once after ready', async () => {
|
||||
let initCount = 0;
|
||||
|
||||
const singletonWithInit = {
|
||||
value: 'singletonValueWithInit',
|
||||
init: async () => {
|
||||
initCount++;
|
||||
}
|
||||
};
|
||||
|
||||
coreContainer.addSingleton('singletonKeyWithInit', singletonWithInit);
|
||||
|
||||
// Call ready twice to ensure hooks are executed only once
|
||||
await coreContainer.ready();
|
||||
await coreContainer.ready();
|
||||
|
||||
expect(initCount).toBe(1);
|
||||
});
|
||||
|
||||
})
|
||||
109
packages/ioc/tsconfig.json
Normal file
109
packages/ioc/tsconfig.json
Normal file
@@ -0,0 +1,109 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
/* Visit https://aka.ms/tsconfig to read more about this file */
|
||||
|
||||
/* Projects */
|
||||
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
|
||||
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
|
||||
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
|
||||
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
|
||||
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
|
||||
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
|
||||
|
||||
/* Language and Environment */
|
||||
"target": "ESNext", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
|
||||
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
|
||||
// "jsx": "preserve", /* Specify what JSX code is generated. */
|
||||
// "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */
|
||||
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
|
||||
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
|
||||
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
|
||||
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
|
||||
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
|
||||
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
|
||||
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
|
||||
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */
|
||||
|
||||
/* Modules */
|
||||
"module": "ESNext", /* Specify what module code is generated. */
|
||||
// "rootDir": "./", /* Specify the root folder within your source files. */
|
||||
"moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
|
||||
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
|
||||
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
|
||||
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
|
||||
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
|
||||
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
|
||||
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
|
||||
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
|
||||
// "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
|
||||
// "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */
|
||||
// "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */
|
||||
// "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
|
||||
// "resolveJsonModule": true, /* Enable importing .json files. */
|
||||
// "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */
|
||||
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
|
||||
|
||||
/* JavaScript Support */
|
||||
"allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
|
||||
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
|
||||
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
|
||||
|
||||
/* Emit */
|
||||
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
|
||||
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
|
||||
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
|
||||
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
|
||||
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
|
||||
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
|
||||
"outDir": "./dist", /* Specify an output folder for all emitted files. */
|
||||
// "removeComments": true, /* Disable emitting comments. */
|
||||
// "noEmit": true, /* Disable emitting files from a compilation. */
|
||||
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
|
||||
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */
|
||||
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
|
||||
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
|
||||
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
|
||||
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
|
||||
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
|
||||
// "newLine": "crlf", /* Set the newline character for emitting files. */
|
||||
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
|
||||
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
|
||||
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
|
||||
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
|
||||
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
|
||||
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
|
||||
|
||||
/* Interop Constraints */
|
||||
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
|
||||
// "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
|
||||
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
|
||||
"esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
|
||||
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
|
||||
"forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
|
||||
|
||||
/* Type Checking */
|
||||
"strict": true, /* Enable all strict type-checking options. */
|
||||
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
|
||||
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
|
||||
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
|
||||
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
|
||||
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
|
||||
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
|
||||
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
|
||||
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
|
||||
// "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */
|
||||
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
|
||||
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
|
||||
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
|
||||
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
|
||||
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
|
||||
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
|
||||
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
|
||||
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
|
||||
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
|
||||
|
||||
/* Completeness */
|
||||
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
|
||||
"skipLibCheck": true /* Skip type checking all .d.ts files. */
|
||||
}
|
||||
}
|
||||
1
packages/poster/.gitignore
vendored
1
packages/poster/.gitignore
vendored
@@ -1,2 +1,3 @@
|
||||
dist/
|
||||
.shadow-cljs
|
||||
src/discord.d.ts
|
||||
|
||||
@@ -1,23 +1,31 @@
|
||||
{
|
||||
"name": "@sern/poster",
|
||||
"version": "1.1.0",
|
||||
"version": "1.2.6",
|
||||
"description": "Post discord application commands",
|
||||
"main": "dist/index.js",
|
||||
"types": "./dist/index.d.ts",
|
||||
"main": "./dist/index.mjs",
|
||||
"module": "./dist/index.mjs",
|
||||
"scripts": {
|
||||
"poster:debug": "shadow-cljs compile poster",
|
||||
"poster:prod": "shadow-cljs release poster",
|
||||
"gen-discord-types": "npx openapi-typescript https://raw.githubusercontent.com/discord/discord-api-spec/main/specs/openapi.json --output ./dts/discord.d.ts",
|
||||
"repl": "shadow-cljs node-repl"
|
||||
},
|
||||
"devDependencies": {
|
||||
"shadow-cljs": "^2.8.52",
|
||||
"source-map-support": "^0.5.13"
|
||||
"poster:debug": "npx squint compile",
|
||||
"poster:prod": "npx squint compile",
|
||||
"gen-discord-types": "npx openapi-typescript https://raw.githubusercontent.com/discord/discord-api-spec/main/specs/openapi.json --output ./src/discord.d.ts",
|
||||
"repl": "npx squint repl"
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"files": [
|
||||
"dist",
|
||||
"README.md",
|
||||
"src",
|
||||
"LICENSE"
|
||||
],
|
||||
"publishConfig": {
|
||||
"access": "public",
|
||||
"tag": "beta"
|
||||
}
|
||||
"tag": "latest"
|
||||
},
|
||||
"dependencies": {
|
||||
"squint-cljs": "latest"
|
||||
},
|
||||
"type": "module"
|
||||
}
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
;; shadow-cljs configuration
|
||||
{:source-paths
|
||||
["src"]
|
||||
|
||||
:dependencies
|
||||
[]
|
||||
|
||||
:builds
|
||||
{:poster {:target :node-library
|
||||
:output-to "dist/index.js"
|
||||
:exports { :client core.poster/poster
|
||||
:isOk core.poster/isOk?
|
||||
:is4XX core.poster/is4XX? }
|
||||
:build-hooks [(dev.mv/hook)]
|
||||
}}}
|
||||
3
packages/poster/squint.edn
Normal file
3
packages/poster/squint.edn
Normal file
@@ -0,0 +1,3 @@
|
||||
{:paths ["src"]
|
||||
:output-dir "dist/"
|
||||
:copy-resources #{ :d.ts }}
|
||||
@@ -1,4 +1,4 @@
|
||||
(ns core.actions)
|
||||
(ns actions)
|
||||
|
||||
|
||||
(def routes {
|
||||
@@ -15,6 +15,12 @@
|
||||
:guild/delete ["DELETE" "/applications/{application.id}/guilds/{guild.id}/commands/{command.id}"]
|
||||
:guild/put ["PUT" "/applications/{application.id}/guilds/{guild.id}/commands"]
|
||||
:application/me ["GET" "/applications/@me"]
|
||||
:user/get ["GET" "/users/{user.id}"]
|
||||
; need to add typings for these
|
||||
:me/guilds ["GET" "/users/@me/guilds"]
|
||||
:me/member ["GET" "/users/@me/guilds/{guild.id}/member"]
|
||||
:me/guild-leave ["DELETE", "/users/@me/guilds/{guild.id}"]
|
||||
:me/connections ["GET", "/users/@me/connections"]
|
||||
})
|
||||
|
||||
(defn- request-init [v]
|
||||
@@ -22,14 +28,11 @@
|
||||
[url (fn [body headers]
|
||||
#js { "method" method
|
||||
"headers" headers
|
||||
"body" (.stringify js/JSON body )})
|
||||
]))
|
||||
"body" (js/JSON.stringify body)}) ]))
|
||||
|
||||
(defn- keyword->str [ky]
|
||||
(subs (str ky) 1))
|
||||
|
||||
(def actions (into {}
|
||||
(map (fn [[k v]] [(keyword->str k) (request-init v)]))
|
||||
(map (fn [[k v]] [k (request-init v)]))
|
||||
routes))
|
||||
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
(ns core.poster
|
||||
(:require [clojure.string :refer [replace]]
|
||||
[shadow.cljs.modern :refer (js-await)]
|
||||
[core.actions :refer [actions]]))
|
||||
|
||||
(def base "https://discord.com/api/v10")
|
||||
|
||||
(defn- inject [remaining-url opts]
|
||||
(-> (str base remaining-url)
|
||||
(replace #"\{application\.id\}" (.-app_id ^js opts))
|
||||
(replace #"\{guild\.id\}" (.-guild_id ^js opts))
|
||||
(replace #"\{command\.id\}" (.-command_id ^js opts))))
|
||||
|
||||
(defn- ?params [^js query]
|
||||
(new js/URLSearchParams query))
|
||||
|
||||
|
||||
(defn fetch-application [headers]
|
||||
#_(println (str base (actions "application/me")))
|
||||
(-> (js/fetch (str base (first (actions "application/me"))) #js{ "headers" headers })
|
||||
(.then (fn [res] (.json res)))
|
||||
(.then (fn [json] (.-id json)))))
|
||||
(defn poster [token, appid]
|
||||
(let [header #js{ "Content-Type" "application/json"
|
||||
"Authorization" (str "Bot " token) } ]
|
||||
(js-await [appid (fetch-application header)]
|
||||
(fn [action opts]
|
||||
(let [[url mkrequest] (actions action)
|
||||
options #js{"app_id" appid
|
||||
"guild_id" (.-guild_id ^js opts)
|
||||
"command_id" (.-command_id ^js opts)}
|
||||
url (new js/URL (inject url options))]
|
||||
(set! (.-search url) (?params (.-query ^js opts)))
|
||||
(js/fetch url (mkrequest (.-body ^js opts) header)))))))
|
||||
|
||||
(defn isOk? [^js response]
|
||||
(.-ok response))
|
||||
|
||||
(defn is4XX? [^js response]
|
||||
(not (.-ok response)))
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
(ns dev.mv)
|
||||
(require '[clojure.java.io :as io])
|
||||
(defn hook
|
||||
{:shadow.build/stage :compile-finish}
|
||||
[build-state & args]
|
||||
(do
|
||||
(when (not (.exists (io/file "./dist"))) (.mkdir (io/file "./dist")))
|
||||
(spit "./dist/discord.d.ts" (slurp "./dts/discord.d.ts"))
|
||||
(spit "./dist/index.d.ts" (slurp "./dts/index.d.ts")))
|
||||
build-state)
|
||||
46
packages/poster/src/index.cljs
Normal file
46
packages/poster/src/index.cljs
Normal file
@@ -0,0 +1,46 @@
|
||||
(ns poster
|
||||
(:require [clojure.string :as s]
|
||||
[actions :refer [actions]]))
|
||||
|
||||
(def ^:private base "https://discord.com/api/v10")
|
||||
|
||||
(defn- inject [remaining-url opts]
|
||||
(-> (str base remaining-url)
|
||||
(s/replace #"\{application\.id\}" (or (.-app_id ^js opts) ""))
|
||||
(s/replace #"\{guild\.id\}" (or (.-guild_id ^js opts) ""))
|
||||
(s/replace #"\{user\.id\}" (or (.-user_id ^js opts) ""))
|
||||
(s/replace #"\{command\.id\}" (or (.-command_id ^js opts) ""))))
|
||||
|
||||
(defn- ?params [^js query]
|
||||
(new js/URLSearchParams query))
|
||||
|
||||
(defn- fetch-application [headers]
|
||||
(let [url (str base (first (get actions "application/me")))]
|
||||
(-> (js/fetch url #js{ "headers" headers })
|
||||
(.then (fn ^:=> [res] (.json res)))
|
||||
(.then (fn ^:=> [son] (if-let [id (.-id son)]
|
||||
id
|
||||
(throw (str "Reason " (.-message son))))))
|
||||
(.catch (fn ^:=> [e] (throw e))))))
|
||||
|
||||
(defn- poster [token]
|
||||
(let [header { "Content-Type" "application/json"
|
||||
"Authorization" (str "Bot " token) }]
|
||||
(^:async fn [action opts]
|
||||
(let [[url mkrequest] (get actions action)
|
||||
appid (js-await (fetch-application header))
|
||||
options {:app_id appid
|
||||
:guild_id (.-guild_id opts)
|
||||
:command_id (.-command_id opts)
|
||||
:user_id (.-user_id opts) }
|
||||
url (new js/URL (inject url options)) ]
|
||||
(set! (.-search url) (?params (.-query opts)))
|
||||
(js/fetch url (mkrequest (.-body opts) header))))))
|
||||
|
||||
(defn- isOk? [response]
|
||||
(.-ok response))
|
||||
|
||||
|
||||
(def default { :client poster
|
||||
:isOk isOk?
|
||||
:is4XX (complement isOk?) })
|
||||
@@ -1,4 +1,3 @@
|
||||
declare module 'index.js';
|
||||
|
||||
import type { paths } from './discord.d.ts'
|
||||
|
||||
@@ -13,6 +12,7 @@ export type GuildGet = paths["/applications/{application_id}/guilds/{guild_id}/c
|
||||
export type GuildEdit = paths["/applications/{application_id}/guilds/{guild_id}/commands/{command_id}"]["patch"]
|
||||
export type GuildDelete = paths["/applications/{application_id}/guilds/{guild_id}/commands/{command_id}"]["delete"]
|
||||
export type GuildPut = paths["/applications/{application_id}/guilds/{guild_id}/commands"]["put"]
|
||||
export type UserGet = paths["/users/{user_id}"]['get']
|
||||
export type ApplicationMe = paths["/applications/@me"]['get']
|
||||
|
||||
type ResponsesForRoute<T> = T extends { responses: infer R } ? R : never;
|
||||
@@ -57,7 +57,8 @@ interface RoutesOptions {
|
||||
"guild/put": [{ body: GuildPut["requestBody"]["content"]['application/json']}
|
||||
& GuildPut["parameters"]["path"]
|
||||
& { application_id?: never }];
|
||||
"application/me": []
|
||||
"application/me": [];
|
||||
"user/get" : [UserGet['parameters']['path'] & { application_id?: never } ]
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import poster from '../dist/index.js';
|
||||
import poster from '../dist/index.mjs';
|
||||
|
||||
const send = await poster.client("");
|
||||
const send = poster.client("token");
|
||||
|
||||
const req = await send("global/get-all", {
|
||||
const req = await send("user/get", {
|
||||
|
||||
});
|
||||
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
import poster from '../dist/index.js';
|
||||
import type { GlobalGetAll, GlobalPut, TypedResponse } from '../dts/index.js';
|
||||
import poster, { type GlobalPut, type TypedResponse } from '../dist/index.js';
|
||||
|
||||
const send = await poster.client("token");
|
||||
const send = await poster.client("MTI0MTA4MzI5NDYzNzA5NzAyMQ.G8EKXD.q4s-pDrim6SnHcsPrFY3uQpn_8SCF8-vSPYZ48");
|
||||
|
||||
|
||||
const req = await send("global/get-all", {
|
||||
|
||||
const req = await send("user/get", {
|
||||
user_id: ""
|
||||
}) as TypedResponse<GlobalPut>; //cast for full typed safety
|
||||
|
||||
if(poster.isOk<GlobalPut>(req)) {
|
||||
|
||||
Reference in New Issue
Block a user