create-gramstax 0.3.21 → 0.4.0

package/dist/src/templates/package.json

@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "logging-pretty": "^3.0.0",
-    "gramstax": "^0.3.20"
+    "gramstax": "^0.3.22"
   },
   "peerDependencies": {
     "typescript": "5.9.3"

package/dist/src/templates/src/base/page.ts

@@ -1,7 +1,7 @@
-import {KeyboardComponent} from "~/components/keyboard"
+import {KeyboardBlock} from "~/blocks/keyboard"
 import {CtxCore} from "~/core/ctx"
 
 export abstract class PageBase extends CtxCore {
-  static kbc = KeyboardComponent
-  static kbd = KeyboardComponent.data
+  static kbk = KeyboardBlock
+  static kbl = KeyboardBlock.label
 }

package/dist/src/templates/src/{components → blocks}/keyboard.ts

@@ -1,8 +1,8 @@
-import {KeyboardData} from "~/data/keyboard"
-import {ComponentKeyboard} from "gramstax"
+import {BlockKeyboard} from "gramstax"
+import {KeyboardLabel} from "~/labels/keyboard"
 
-export class KeyboardComponent extends ComponentKeyboard {
-  static data = KeyboardData
+export class KeyboardBlock extends BlockKeyboard {
+  static label = KeyboardLabel
   static home(lang?: string, type?: string) {
     return this._build(`home`, lang, type)
   }

package/dist/src/templates/src/core/bot.ts

@@ -1,11 +1,10 @@
 import {Gramstax} from "gramstax"
 import {UserGuard} from "~/guards/user"
-import {GeneralErrorPage} from "~/pages/general-error"
-import {GeneralErrorInputNotFoundPage} from "~/pages/general-error-input-notfound"
+import {GeneralStatusPage} from "~/pages/general-status"
 import type {CtxCore} from "./ctx"
 
 export class BotCore extends Gramstax {
-  async hookBeforeRoute(ctx: CtxCore): Promise<boolean> {
+  async hookBeforeRoute(ctx: CtxCore) {
     const result = await new UserGuard(ctx).ensureValid(true)
     if (result === null) {
       return false
@@ -13,11 +12,11 @@ export class BotCore extends Gramstax {
     return true
   }
 
-  async hookErrorPage(ctx: CtxCore, listenerName: string, error: any, isEdit: boolean): Promise<void> {
-    await new GeneralErrorPage(ctx).transition(listenerName, error, isEdit)
+  async hookErrorPage(ctx: CtxCore, listenerName: string, error: any, isEdit: boolean) {
+    await new GeneralStatusPage(ctx).toError(`${listenerName}:hookErrorPage`, error, isEdit)
   }
 
-  async hookErrorInputNotFoundPage(ctx: CtxCore): Promise<void> {
-    await new GeneralErrorInputNotFoundPage(ctx).transition()
+  async hookErrorInputNotFoundPage(ctx: CtxCore) {
+    await new GeneralStatusPage(ctx).toErrorInputNotFound()
   }
 }

package/dist/src/templates/src/env.ts

@@ -1,5 +1,5 @@
 export const env = {
-  BOT_TOKEN: process.env.BOT_TOKEN as string,
-  BOT_DEPLOY: process.env.BOT_DEPLOY as string,
-  CACHE_SESSION: process.env.CACHE_SESSION as string
+  TELEGRAM_BOT_TOKEN: process.env.TELEGRAM_BOT_TOKEN as string,
+  TELEGRAM_BOT_DEPLOY: process.env.TELEGRAM_BOT_DEPLOY as string,
+  TELEGRAM_CACHE_SESSION: process.env.TELEGRAM_CACHE_SESSION as string
 }

package/dist/src/templates/src/guards/user.ts

@@ -1,8 +1,13 @@
 import {GuardBase} from "~/base/guard"
-import {GeneralErrorPage} from "~/pages/general-error"
+import {GeneralStatusPage} from "~/pages/general-status"
 import {UserNameNotFoundPage} from "~/pages/username-notfound"
 
 export class UserGuard extends GuardBase {
+  async _catch(err: any, func: any, isEdit: boolean) {
+    await new GeneralStatusPage(this).toError(func, err, isEdit)
+    return null
+  }
+
   async ensureValid(isEdit: boolean) {
     try {
       if (!this.userName || this.userName.length == 0) {
@@ -11,8 +16,7 @@ export class UserGuard extends GuardBase {
       }
       return {status: true}
     } catch (err) {
-      await new GeneralErrorPage(this).transition(`ensureValid`, err, isEdit)
-      return null
+      return await this._catch(err, `ensureValid`, isEdit)
     }
   }
 }

package/dist/src/templates/src/index.ts

@@ -6,9 +6,9 @@ import {CacheExternal} from "gramstax"
 logUt.success(`Bot started..`)
 
 new BotCore({
-  token: env.BOT_TOKEN,
-  deploy: env.BOT_DEPLOY,
-  cacheSession: new CacheExternal(env.CACHE_SESSION, `session`, 24 * 60 * 60 * 1000),
+  token: env.TELEGRAM_BOT_TOKEN,
+  deploy: env.TELEGRAM_BOT_DEPLOY,
+  cacheSession: new CacheExternal(env.TELEGRAM_CACHE_SESSION, `session`, 24 * 60 * 60 * 1000),
   optionsPage: {
     shortCallbackData: true
   }

package/dist/src/templates/src/{data → labels}/keyboard.ts

@@ -1,6 +1,6 @@
-import {DataKeyboard} from "gramstax"
+import {LabelKeyboard} from "gramstax"
 
-export class KeyboardData extends DataKeyboard {
+export class KeyboardLabel extends LabelKeyboard {
   static home(lang?: string) {
     return this._build(lang, false, {
       default: `Home`,

package/dist/src/templates/src/pages/general-status.ts

@@ -0,0 +1,64 @@
+import {log} from "gramstax"
+import {PageBase} from "~/base/page"
+import {StartPage} from "./start"
+
+export class GeneralStatusPage extends PageBase {
+  constructorName?: string
+  constructor(p: any) {
+    super(p)
+    this.constructorName = p?.constructor?.name
+  }
+
+  kb() {
+    return this.inlineKeyboard((k, a) => {
+      return k.text(a[0]!, StartPage.data.callback())
+    })
+  }
+
+  async toError(funcName: string, error: any, isUpdate = true) {
+    log.errorMake(error, this.constructorName, funcName)
+
+    await this.sessionClear()
+    const kb = this.kb()
+    const id = `error`
+    if (isUpdate === true) {
+      await this.edit(kb, {}, id)
+    } else {
+      await this.reply(kb, {}, id)
+    }
+  }
+
+  async toErrorInputNotFound() {
+    await this.reply(this.kb(), {}, `error-input-notfound`)
+  }
+
+  static template = `
+    <base>
+      ${this.kbk.home()}
+    </base>
+
+    <base id="error">
+      <message>
+        <b>❌ Error</b>
+
+        An unexpected error occurred.
+        Please try again later.
+      </message>
+      <message lang="id">
+        <b>❌ Kesalahan</b>
+
+        Terjadi kesalahan yang tidak diharapkan.
+        Silakan coba lagi nanti.
+      </message>
+    </base>
+
+    <base id="error-input-notfound">
+      <message>
+        <b>❌ Not Found</b>
+      </message>
+      <message lang="id">
+        <b>❌ Tidak Ditemukan</b>
+      </message>
+    </base>
+  `
+}

package/dist/src/templates/src/pages/help.ts

@@ -3,31 +3,28 @@ import {StartPage} from "./start"
 
 export class HelpPage extends PageBase {
   kb() {
-    return this.ikb((k, a) => {
-      return k.text(a[0]!, StartPage.data.callbackData())
+    return this.inlineKeyboard((k, a) => {
+      return k.text(a[0]!, StartPage.data.callback())
     })
   }
 
-  async internal(edit = true) {
+  async core(edit = true) {
     const kb = this.kb()
-    if (edit) {
-      await this.edit(kb)
-    } else {
-      await this.reply(kb)
-    }
+    if (edit) await this.edit(kb)
+    else await this.reply(kb)
   }
 
   async callback() {
-    await this.internal(true)
+    await this.core(true)
   }
 
   async textCommand() {
-    await this.internal(false)
+    await this.core(false)
   }
 
   static template = `
     <base>
-      ${this.kbc.back()}
+      ${this.kbk.back()}
       <message><b>Help message</b></message>
       <message lang="it"><b>Ordina aiuto</b></message>
       <message lang="id"><b>Pesan bantuan</b></message>

package/dist/src/templates/src/pages/input-text.ts

@@ -4,12 +4,12 @@ import {SessionGuard} from "~/guards/session"
 
 export class InputTextPage extends PageBase {
   static data = this.buildData({
-    textCommand: `input_text`
+    intentTextCommand: `input_text`
   })
 
   kb(baseId?: string) {
-    return this.ikb((k, a) => {
-      return k.text(a[0]!, StartPage.data.callbackData()), {baseId}
+    return this.inlineKeyboard((k, a) => {
+      return k.text(a[0]!, StartPage.data.callback()), {baseId}
     })
   }
 
@@ -44,13 +44,13 @@ export class InputTextPage extends PageBase {
 
   static template = `
     <base>
-      ${this.kbc.cancel()}
+      ${this.kbk.cancel()}
       <message>Please input text you want view</message>
       <message lang="it">Inserisci il testo che vuoi vedere</message>      
       <message lang="id">Tolong masukan text yang ingin anda liat</message>
     </base>
     <base id="result">
-      ${this.kbc.home()}
+      ${this.kbk.home()}
       <message>
         Result: {{res}}
 

package/dist/src/templates/src/pages/start.ts

@@ -3,27 +3,24 @@ import {PageBase} from "~/base/page"
 
 export class StartPage extends PageBase {
   kb() {
-    return this.ikb((k, a) => {
-      return k.text(a[0]!, HelpPage.data.callbackData())
+    return this.inlineKeyboard((k, a) => {
+      return k.text(a[0]!, HelpPage.data.callback())
     })
   }
 
-  async internal(edit = true) {
+  async core(edit = true) {
     const kb = this.kb()
     const data = {userName: this.userName}
-    if (edit) {
-      await this.edit(kb, data)
-    } else {
-      await this.reply(kb, data)
-    }
+    if (edit) await this.edit(kb, data)
+    else await this.reply(kb, data)
   }
 
   async callback() {
-    await this.internal(true)
+    await this.core(true)
   }
 
   async textCommand() {
-    await this.internal(false)
+    await this.core(false)
   }
 
   static template = `

package/dist/src/templates/src/pages/username-notfound.ts

@@ -3,23 +3,20 @@ import {PageBase} from "~/base/page"
 
 export class UserNameNotFoundPage extends PageBase {
   kb() {
-    return this.ikb((k, a) => {
-      return k.text(a[0]!, HelpPage.data.callbackData())
+    return this.inlineKeyboard((k, a) => {
+      return k.text(a[0]!, HelpPage.data.callback())
     })
   }
 
   async transition(edit = true) {
     const kb = this.kb()
-    if (edit) {
-      await this.edit(kb)
-    } else {
-      await this.reply(kb)
-    }
+    if (edit) await this.edit(kb)
+    else await this.reply(kb)
   }
 
   static template = `
     <base>
-      ${this.kbc.home()}
+      ${this.kbk.home()}
       <message>Please set the username first before using the bot.</message>
       <message lang="it">Prima di utilizzare il bot, imposta prima il nome utente.</message>
       <message lang="id">Tolong set username dulu sebelum memakai bot</message>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-gramstax",
-  "version": "0.3.21",
+  "version": "0.4.0",
   "private": false,
   "publishConfig": {
     "access": "public",

package/dist/src/templates/src/pages/general-error-input-notfound.ts

@@ -1,45 +0,0 @@
-import {PageBase} from "~/base/page"
-import {StartPage} from "./start"
-
-export class GeneralErrorInputNotFoundPage extends PageBase {
-  kb() {
-    return this.ikb((k, a) => {
-      return k.text(a[0]!, StartPage.data.callbackData())
-    })
-  }
-
-  async transition(session?: boolean) {
-    if (session || this.session.method) {
-      await this.reply(this.kb(), undefined, `session-error`)
-      await this.sessionClear()
-    } else {
-      await this.reply(this.kb())
-    }
-  }
-
-  static template = `
-    <base>
-      ${this.kbc.home()}
-      <message>
-        <b>❌ Not Found</b>
-      </message>
-      <message lang="id">
-        <b>❌ Tidak Ditemukan</b>
-      </message>
-    </base>
-    <base id="session-error">
-      <message>
-        <b>❌ Session Error</b>
-
-        An error occurred while processing your request.
-        Your session has an error.
-      </message>
-      <message lang="id">
-        <b>❌ Kesalahan Sesi</b>
-
-        Terjadi kesalahan saat memproses permintaan.
-        Sesi Anda bermasalh.
-      </message>
-    </base>
-  `
-}

package/dist/src/templates/src/pages/general-error.ts

@@ -1,53 +0,0 @@
-import {logUt} from "~/utils/log"
-import {PageBase} from "~/base/page"
-import {StartPage} from "./start"
-
-export class GeneralErrorPage extends PageBase {
-  constructorName?: string
-  constructor(p: any) {
-    super(p)
-    this.constructorName = p?.constructor?.name
-  }
-
-  kb() {
-    return this.ikb((k, a) => {
-      return k.text(a[0]!, StartPage.data.callbackData())
-    })
-  }
-
-  async transition(funcName: string, error: unknown, isUpdate = true) {
-    logUt.errorMake(error, this.constructorName, funcName)
-    await this.sessionClear()
-
-    const kb = this.kb()
-    if (isUpdate === true) {
-      await this.edit(kb)
-    } else {
-      await this.reply(kb)
-    }
-  }
-
-  static template = `
-    <base>
-      ${this.kbc.home()}
-      <message>
-        <b>❌ Error</b>
-
-        An unexpected error occurred.
-        Please try again later.
-      </message>
-      <message lang="it">
-        <b>❌ Errore</b>
-
-        Si è verificato un errore imprevisto.
-        Riprova più tardi.
-      </message>
-      <message lang="id">
-        <b>❌ Kesalahan</b>
-
-        Terjadi kesalahan yang tidak diharapkan.
-        Silakan coba lagi nanti.
-      </message>
-    </base>
-  `
-}