diff --git a/.dockerignore b/.dockerignore index 8ec76ca..1596d6e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,3 +2,4 @@ node_modules dist .env .env.production +drizzle diff --git a/.gitignore b/.gitignore index 8ec76ca..1596d6e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules dist .env .env.production +drizzle diff --git a/Dockerfile b/Dockerfile index 13f6b6c..0a24ae7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,46 @@ -FROM oven/bun AS builder +# syntax = docker/dockerfile:1 -WORKDIR /src +# Adjust BUN_VERSION as desired +ARG BUN_VERSION=1.0.2 +FROM oven/bun:${BUN_VERSION} as base -COPY . . +LABEL fly_launch_runtime="Bun" -ENV NODE_ENV=production +# Bun app lives here +WORKDIR /app -RUN bun i && \ - bun run generate && \ - bun build --target bun --outfile dist/kbbi.js ./src/main.ts +# Set production environment +ENV NODE_ENV="production" -FROM oven/bun -WORKDIR /app +# Throw-away build stage to reduce size of final image +FROM base as build + +# Install packages needed to build node modules +RUN apt-get update -qq && \ + apt-get install -y build-essential pkg-config python-is-python3 + +# Install node modules +COPY --link bun.lockb package.json ./ +RUN bun install + +# Copy application code +COPY --link . . + +# Build application +RUN bun run generate + +# Remove development dependencies +RUN rm -rf node_modules && \ + bun install --ci + -COPY --from=builder /src/dist/kbbi.js /app/kbbi.js -COPY --from=builder /src/package.json /app/package.json -COPY --from=builder /src/bun.lockb /app/bun.lockb -COPY --from=builder /src/drizzle /app/drizzle +# Final stage for app image +FROM base -RUN bun i -p +# Copy built application +COPY --from=build /app /app -ENTRYPOINT [ "bun", "run", "/app/kbbi.js" ] +# Start the server by default, this can be overwritten at runtime +EXPOSE 3000 +CMD [ "bun", "run", "src/main.ts" ] diff --git a/bun.lockb b/bun.lockb index fa6efd3..3722c45 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/drizzle.config.js b/drizzle.config.js new file mode 100644 index 0000000..967446f --- /dev/null +++ b/drizzle.config.js @@ -0,0 +1,4 @@ +export default { + schema: './src/db/postgres/schemas/*', + out: './drizzle', +}; diff --git a/fly.toml b/fly.toml index aa29732..e10c46f 100644 --- a/fly.toml +++ b/fly.toml @@ -1,17 +1,17 @@ -# fly.toml app configuration file generated for kbbi-bot on 2023-09-26T17:57:06+07:00 +# fly.toml app configuration file generated for kbbi-bot-v3 on 2023-09-26T19:48:53+07:00 # # See https://fly.io/docs/reference/configuration/ for information about how to use this file. # -app = "kbbi-bot" +app = "kbbi-bot-v3" primary_region = "sin" [build] [http_service] - internal_port = 3000 - force_https = true - auto_stop_machines = true - auto_start_machines = true - min_machines_running = 0 - processes = ["app"] +internal_port = 8080 +force_https = true +auto_stop_machines = false +auto_start_machines = true +min_machines_running = 0 +processes = ["app"] diff --git a/package.json b/package.json index 642a7c8..654c80e 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "format": "prettier -w ./src/", "lint": "tsc --noEmit && eslint --fix src/", "build": "tsc", - "start": "bun run ./src/main.ts", + "start": "bun run dist/main.js", "generate": "drizzle-kit generate:pg" }, "keywords": [], @@ -23,8 +23,10 @@ "telegraf": "^4.14.0" }, "devDependencies": { + "@flydotio/dockerfile": "latest", "@typescript-eslint/eslint-plugin": "^6.7.3", "@typescript-eslint/parser": "^6.7.3", + "bun-types": "^1.0.3", "drizzle-kit": "^0.19.13", "eslint": "^8.50.0", "prettier": "^3.0.3", diff --git a/src/Fetcher.ts b/src/Fetcher.ts index 83beada..d84c8f2 100644 --- a/src/Fetcher.ts +++ b/src/Fetcher.ts @@ -1,4 +1,4 @@ -import config from './config/config' +import config from './config/config.js' // fetcher class export class Fetcher { diff --git a/src/Scraper.ts b/src/Scraper.ts index 51785ff..1e0ef0d 100644 --- a/src/Scraper.ts +++ b/src/Scraper.ts @@ -3,7 +3,7 @@ import { load, CheerioAPI } from 'cheerio' // import pretty from 'pretty' // interface -import { IPengertian } from './interfaces/result.interface' +import { IPengertian } from './interfaces/result.interface.js' // scraper class export class Scraper { @@ -30,7 +30,7 @@ export class Scraper { // get prakategorial this.prakategorial ??= this.$( - 'font[title="prakategorial: kata tidak dipakai dalam bentuk dasarnya"]' + 'font[title="prakategorial: kata tidak dipakai dalam bentuk dasarnya"]', ) .next() .text() as string diff --git a/src/app.ts b/src/app.ts index b9e9b61..1bd449a 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,18 +1,13 @@ -import { format, isFuture } from 'date-fns' -import { id } from 'date-fns/locale' import { eq, sql } from 'drizzle-orm' -import { HttpsProxyAgent } from 'https-proxy-agent' -import { Context, Markup, Telegraf } from 'telegraf' -import { InlineKeyboardButton } from 'telegraf/types' - -import { Fetcher } from './Fetcher' -import { Scraper } from './Scraper' -import { blackList } from './blacklist/blacklist' -import config from './config/config' -import { db } from './db/postgres' -import { User, users } from './db/postgres/schemas/user.schema' -import { CallbackQuery } from './interfaces/callback-query.interface' -import { IResult } from './interfaces/result.interface' +import { Context, Telegraf } from 'telegraf' + +import { Fetcher } from './Fetcher.js' +import { Scraper } from './Scraper.js' +import config from './config/config.js' +import { db } from './db/postgres/index.js' +import { User, users } from './db/postgres/schemas/user.schema.js' +import { CallbackQuery } from './interfaces/callback-query.interface.js' +import { IResult } from './interfaces/result.interface.js' interface MyContext extends Context { user: User @@ -81,12 +76,12 @@ export default class App { return this.result } - private createUrlButton(keyword: string) { - return Markup.button.url( - `📕 ${keyword.toLowerCase()}`, - `https://kbbi.kemdikbud.go.id/entri/${keyword.toLowerCase()}`, - ) - } + // private createUrlButton(keyword: string) { + // return Markup.button.url( + // `📕 ${keyword.toLowerCase()}`, + // `https://kbbi.kemdikbud.go.id/entri/${keyword.toLowerCase()}`, + // ) + // } // private createReportButton(keyword: string) { // return Markup.button.callback( @@ -95,32 +90,32 @@ export default class App { // ) // } - private createInlineKeyboard( - // reportBtn: InlineKeyboardButton.CallbackButton, - urlBtn: InlineKeyboardButton.UrlButton, - ) { - return Markup.inlineKeyboard([/* reportBtn, */ urlBtn]) - } + // private createInlineKeyboard( + // // reportBtn: InlineKeyboardButton.CallbackButton, + // urlBtn: InlineKeyboardButton.UrlButton, + // ) { + // return Markup.inlineKeyboard([/* reportBtn, */ urlBtn]) + // } - checkBlackList(ctx: Context, next: () => Promise) { - const username = ctx.message?.from.username - const result = blackList.find((value) => value.username === username) - if (!result) { - next() - } else { - if (isFuture(result.until)) { - ctx.replyWithMarkdown( - `*Anda telah dibanned dari bot ini!* -Alasan: ${result.reason} - -Akses Anda akan dipulihkan pada: -*${format(result.until, 'EEEE, d MMMM yyyy HH:mm', { locale: id })}*`, - ) - } else { - next() - } - } - } + // checkBlackList(ctx: Context, next: () => Promise) { + // const username = ctx.message?.from.username + // const result = blackList.find((value) => value.username === username) + // if (!result) { + // next() + // } else { + // if (isFuture(result.until)) { + // ctx.replyWithMarkdown( + // `*Anda telah dibanned dari bot ini!* + // Alasan: ${result.reason} + // + // Akses Anda akan dipulihkan pada: + // *${format(result.until, 'EEEE, d MMMM yyyy HH:mm', { locale: id })}*`, + // ) + // } else { + // next() + // } + // } + // } async main(ctx: MyContext, keyword: string) { const html = await this.fetchData(keyword) diff --git a/src/blacklist/blacklist.ts b/src/blacklist/blacklist.ts deleted file mode 100644 index 68fb8f0..0000000 --- a/src/blacklist/blacklist.ts +++ /dev/null @@ -1,12 +0,0 @@ -export const blackList = [ - { - username: 'AzizNaufal', - reason: 'Spam report', - until: new Date('2022-03-22T09:00:00+07:00'), - }, - /*{ - username: 'tfkhdyt', - reason: 'Spam report', - until: new Date('2022-03-22T06:00:00+07:00'), - },*/ -] diff --git a/src/main.ts b/src/main.ts index 4678565..95b41c4 100644 --- a/src/main.ts +++ b/src/main.ts @@ -3,10 +3,10 @@ import { drizzle } from 'drizzle-orm/postgres-js' import { migrate } from 'drizzle-orm/postgres-js/migrator' import { message } from 'telegraf/filters' -import App from './app' -import config from './config/config' -import { db, migrationClient } from './db/postgres' -import { users } from './db/postgres/schemas/user.schema' +import App from './app.js' +import config from './config/config.js' +import { db, migrationClient } from './db/postgres/index.js' +import { users } from './db/postgres/schemas/user.schema.js' await migrate(drizzle(migrationClient), { migrationsFolder: 'drizzle' }) @@ -15,7 +15,6 @@ const app = new App(config.botToken) const bot = app.bot // middleware -bot.use(app.checkBlackList) bot.use(async (ctx, next) => { try { const userId = ctx.from?.id diff --git a/tsconfig.json b/tsconfig.json index 7550e50..94f71d8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,54 +1,56 @@ { "compilerOptions": { - /* Visit https://aka.ms/tsconfig.json to read more about this file */ + /* Visit https://aka.ms/tsconfig to read more about this file */ /* Projects */ - // "incremental": true, /* Enable incremental compilation */ + // "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": "./", /* Specify the folder for .tsbuildinfo incremental compilation files. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects */ + // "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": [ - "dom" - ], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + "target": "ES2021" /* 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' */ + // "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. */ + // "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": "NodeNext", - "rootDir": "./src", /* Specify the root folder within your source files. */ - "moduleResolution": "Bundler", /* Specify how TypeScript looks up a file from a given module specifier. */ + "module": "ES2022" /* 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. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + "types": [ + "bun-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 ``s from expanding the number of files TypeScript should add to a project. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "resolveJsonModule": true, /* Enable importing .json files. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''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. */ + // "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`. */ + // "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. */ + // "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": "./", /* 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 */ + // "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. */ @@ -56,46 +58,40 @@ // "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. */ + // "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. */ + // "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. */ // "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. */ + "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. */ + "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`. */ + "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. */ + // "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, /* Type catch clause variables as 'unknown' instead of 'any'. */ + // "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 a local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */ + // "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, /* Include 'undefined' in index signature results */ + // "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 */ + // "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. */ - }, - "include": [ - "./src" - ], - "exclude": [ - "./node_modules" - ] + } }