shane/AutoMod
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move API to bun

Browse source
This commit is contained in:
Declan Chidlow 2024-07-12 20:58:58 +08:00
parent 4bc049064b
commit 742797fab4
9 changed files with 60 additions and 2040 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
api/.gitignore vendored
View file

@ -1,7 +1,6 @@
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
# IDE / editor specific ignores
.idea/
.vscode/
# JavaScript
node_modules

786
api/.yarn/releases/yarn-3.2.1.cjs vendored
View file

File diff suppressed because one or more lines are too long

2
api/.yarnrc.yml
View file

@ -1,2 +0,0 @@
yarnPath: .yarn/releases/yarn-3.2.1.cjs
nodeLinker: node-modules

21
api/Dockerfile
View file

@ -1,19 +1,16 @@
FROM node:18 as build
FROM oven/bun:1 as build
WORKDIR /build/app
COPY api/package.json api/yarn.lock api/.yarnrc.yml ./
COPY api/.yarn ./.yarn
COPY api/package.json api/bun.lockb ./
COPY lib ../lib
RUN yarn --cwd ../lib --immutable
RUN yarn --cwd ../lib build
RUN yarn install --immutable
RUN cd ../lib && bun install --frozen-lockfile && bun run build
RUN bun install --frozen-lockfile
COPY ./api .
RUN yarn build
RUN bun run build
FROM node:18 as prod
FROM oven/bun:1 as prod
WORKDIR /app/api
COPY --from=build /build/app/package.json /build/app/yarn.lock /build/app/.yarnrc.yml ./
COPY --from=build /build/app/.yarn ./.yarn
COPY --from=build /build/app/package.json /build/app/bun.lockb ./
COPY --from=build /build/app/dist ./dist
COPY --from=build /build/lib ../lib
RUN yarn install --immutable
CMD ["yarn", "start"]
RUN bun install --production --frozen-lockfile
CMD ["bun", "start"]

BIN
api/bun.lockb Executable file
View file

Binary file not shown.

31
api/package.json
View file

@ -1,35 +1,32 @@
{
"name": "api",
"version": "1.0.0",
"description": "",
"exports": "./index",
"type": "module",
"scripts": {
"build": "rm -rf dist && tsc",
"start": "node --experimental-specifier-resolution=node dist/index",
"dev": "yarn build && yarn start"
"build": "rm -rf dist && bun build ./src/index.ts --outdir=dist --target=bun --sourcemap",
"start": "bun dist/index.js",
"dev": "bun run build && bun run start"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"@types/express": "^4.17.13",
"@types/express": "^4.17.21",
"@types/monk": "^6.0.0",
"@types/ws": "^8.2.2",
"@types/ws": "^8.5.10",
"automod": "^0.1.0",
"dotenv": "^14.2.0",
"express": "^4.17.3",
"dotenv": "^14.3.2",
"express": "^4.19.2",
"log75": "^2.2.0",
"monk": "^7.3.4",
"redis": "^4.2.0",
"redis": "^4.6.15",
"ulid": "^2.3.0",
"ws": "^8.4.2"
"ws": "^8.18.0"
},
"devDependencies": {
"typescript": "^4.5.5"
"@types/bun": "^1.1.6",
"bun-types": "latest"
},
"packageManager": "yarn@3.2.1",
"resolutions": {
"automod": "portal:../lib"
"module": "index.ts",
"peerDependencies": {
"typescript": "^4.9.5"
}
}

117
api/tsconfig.json
View file

@ -1,100 +1,29 @@
{
"compilerOptions": {
/* Visit https://aka.ms/tsconfig.json to read more about this file */
// Enable latest features
"lib": ["ESNext", "DOM"],
"target": "ESNext",
"module": "ESNext",
"moduleDetection": "force",
"jsx": "react-jsx",
"allowJs": true,
/* Projects */
// "incremental": true, /* Enable incremental compilation */
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
// "tsBuildInfoFile": "./", /* Specify the folder for .tsbuildinfo incremental compilation files. */
// "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. */
// Bundler mode
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"verbatimModuleSyntax": true,
"noEmit": true,
/* Language and Environment */
"target": "es6", /* 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 TC39 stage 2 draft 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. */
// Best practices
"strict": true,
"skipLibCheck": true,
"noFallthroughCasesInSwitch": true,
/* Modules */
"module": "ES2020", /* Specify what module code is generated. */
"rootDir": "./src", /* 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. */
// "resolveJsonModule": true, /* Enable importing .json files */
// "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. */
// "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. */
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
// "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. */
/* Interop Constraints */
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
// "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": false, /* 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, /* Type catch clause variables as 'unknown' instead of 'any'. */
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
// "noUnusedLocals": true, /* Enable error reporting when a 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, /* Include 'undefined' in index signature results */
// "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. */
}
// Some stricter flags (disabled by default)
"noUnusedLocals": false,
"noUnusedParameters": false,
"noPropertyAccessFromIndexSignature": false
},
"include": ["src/**/*"],
"exclude": ["node_modules", "dist"]
}

1113
api/yarn.lock
View file

File diff suppressed because it is too large Load diff

17
lib/src/misc/database.ts
View file

@ -12,7 +12,7 @@ import { createClient } from 'redis';
const _redisClient = createClient();
type RedisClient = typeof _redisClient;
class CachedDb<T> {
class CachedDb<T extends { [key: string]: any }> {
db: ICollection<T>;
redis: RedisClient;
ttl: number = 300;
@ -39,8 +39,7 @@ class CachedDb<T> {
if (this.debug) console.debug('Db: Answering from cache');
resolve(JSON.parse(res));
return;
}
else if (this.debug) console.debug('Db: Fetching from database');
} else if (this.debug) console.debug('Db: Fetching from database');
const mongoRes = await this.db.findOne({ [this.mongoIndexKey]: key } as any);
resolve(mongoRes ?? undefined);
@ -48,10 +47,10 @@ class CachedDb<T> {
try {
await this.redis.SET(`${this.redisPrefix}:${key}`, JSON.stringify(mongoRes));
await this.redis.EXPIRE(`${this.redisPrefix}:${key}`, this.ttl);
} catch(e) {
} catch (e) {
console.warn('Failed to cache to redis:', e);
}
} catch(e) { reject(e) }
} catch (e) { reject(e); }
});
}
@ -70,13 +69,13 @@ class CachedDb<T> {
);
resolve(res);
if (!res.ok) return console.debug('Db: Not caching;', res);
} catch(e) { reject(e) }
} catch (e) { reject(e); }
try {
if (this.debug) console.debug('Db: Caching updated document');
await this.redis.SET(`${this.redisPrefix}:${key}`, JSON.stringify(value));
await this.redis.EXPIRE(`${this.redisPrefix}:${key}`, this.ttl);
} catch(e) {
} catch (e) {
console.warn('Failed to cache to redis:', e);
}
});
@ -101,10 +100,10 @@ class CachedDb<T> {
try {
await this.redis.SET(`${this.redisPrefix}:${key}`, JSON.stringify(res));
await this.redis.EXPIRE(`${this.redisPrefix}:${key}`, this.ttl);
} catch(e) {
} catch (e) {
console.warn('Failed to cache to redis:', e);
}
} catch(e) { reject(e) }
} catch (e) { reject(e); }
});
}
}