@sentio/cli 2.0.0-rc.1 → 2.0.0-rc.10

package/src/commands/login-server.ts

@@ -1,9 +1,9 @@
 import express from 'express'
-import { getAuthConfig, getFinalizedHost } from '../config'
+import { getAuthConfig, getFinalizedHost } from '../config.js'
 import url, { URL } from 'url'
 import fetch from 'node-fetch'
-import { getCliVersion } from '../utils'
-import { WriteKey } from '../key'
+import { getCliVersion } from '../utils.js'
+import { WriteKey } from '../key.js'
 import chalk from 'chalk'
 import http from 'http'
 import os from 'os'
@@ -26,7 +26,7 @@ export function startServer(params: AuthParams) {
 }
 
 app.get('/callback', async (req, res) => {
-  const fail = function(...args: any[]) {
+  const fail = function (...args: any[]) {
     console.error(chalk.red(args))
     res.end(args.toString())
     server.close()
@@ -45,8 +45,8 @@ app.get('/callback', async (req, res) => {
     fail(`Failed to get access token: ${tokenResRaw.status} ${tokenResRaw.statusText}`)
     return
   }
-  const tokenRes = await tokenResRaw.json()
-  const accessToken = tokenRes['access_token']
+  const tokenRes = (await tokenResRaw.json()) as { access_token: string }
+  const accessToken = tokenRes.access_token
 
   // check if the account is ready
   const userResRaw = await getUser(host, accessToken)
@@ -58,7 +58,7 @@ app.get('/callback', async (req, res) => {
     }
     return
   }
-  const userRes = await userResRaw.json()
+  const userRes = (await userResRaw.json()) as { emailVerified: boolean }
   if (!userRes.emailVerified) {
     fail('Your account is not verified, please verify your email first')
     return
@@ -71,11 +71,11 @@ app.get('/callback', async (req, res) => {
     fail(`Failed to create API key: ${createApiKeyResRaw.status} ${createApiKeyResRaw.statusText}`)
     return
   }
-  const createApiKeyRes = await createApiKeyResRaw.json()
-  const apiKey = createApiKeyRes['key']
+  const createApiKeyRes = (await createApiKeyResRaw.json()) as { key: string }
+  const apiKey = createApiKeyRes.key
   WriteKey(host, apiKey)
 
-  res.end("Login success, please go back to CLI to continue")
+  res.end('Login success, please go back to CLI to continue')
   console.log(chalk.green('Login success, new API key: ' + apiKey))
 
   server.close()
@@ -101,7 +101,7 @@ async function getToken(host: string, code: string) {
 
 async function createApiKey(host: string, name: string, source: string, accessToken: string) {
   const createApiKeyUrl = new URL('/api/v1/keys', host)
-  return fetch(createApiKeyUrl, {
+  return fetch(createApiKeyUrl.href, {
     method: 'POST',
     headers: {
       Authorization: 'Bearer ' + accessToken,
@@ -117,7 +117,7 @@ async function createApiKey(host: string, name: string, source: string, accessTo
 
 async function getUser(host: string, accessToken: string) {
   const getUserUrl = new URL('/api/v1/users', host)
-  return fetch(getUserUrl, {
+  return fetch(getUserUrl.href, {
     method: 'GET',
     headers: {
       Authorization: 'Bearer ' + accessToken,

package/src/commands/run-create.ts

@@ -109,16 +109,6 @@ export async function runCreate(argv: string[]) {
       const sdkVersion = '^' + (await latestVersion('@sentio/sdk'))
       packageJson.dependencies['@sentio/sdk'] = sdkVersion
 
-      switch (chainType) {
-        case 'aptos':
-          packageJson.dependencies['@sentio/sdk-aptos'] = sdkVersion
-          break
-        case 'solana':
-          packageJson.dependencies['@sentio/sdk-solana'] = sdkVersion
-          break
-        default:
-      }
-
       const cliVersion = '^' + (await latestVersion('@sentio/cli'))
       packageJson.devDependencies['@sentio/cli'] = cliVersion
       packageJson.name = projectName
@@ -126,8 +116,6 @@ export async function runCreate(argv: string[]) {
       if (options.subproject) {
         delete packageJson.dependencies['@sentio/sdk']
         delete packageJson.devDependencies['@sentio/cli']
-        delete packageJson.dependencies['@sentio/sdk-aptos']
-        delete packageJson.dependencies['@sentio/sdk-solana']
       }
 
       // Don't add directly to avoid deps issue

package/src/commands/run-login.ts

@@ -1,11 +1,11 @@
 import commandLineArgs from 'command-line-args'
 import commandLineUsage from 'command-line-usage'
-import { getAuthConfig, getFinalizedHost } from '../config'
-import { startServer } from './login-server'
+import { getAuthConfig, getFinalizedHost } from '../config.js'
+import { startServer } from './login-server.js'
 import url, { URL } from 'url'
 import * as crypto from 'crypto'
 import chalk from 'chalk'
-import { WriteKey } from '../key'
+import { WriteKey } from '../key.js'
 import fetch from 'node-fetch'
 import open from 'open'
 
@@ -102,7 +102,7 @@ function sha256(str: string) {
 
 async function checkKey(host: string, apiKey: string) {
   const checkApiKeyUrl = new URL('/api/v1/processors/check_key', host)
-  return fetch(checkApiKeyUrl, {
+  return fetch(checkApiKeyUrl.href, {
     method: 'GET',
     headers: {
       'api-key': apiKey,

package/src/commands/run-test.ts

@@ -0,0 +1,10 @@
+import { execSync } from 'child_process'
+import path from 'path'
+import { getPackageRoot } from '../utils.js'
+
+export function runTest(argv: string[]) {
+  const defaultJestConfig = path.resolve(getPackageRoot('@sentio/sdk'), 'lib', 'jest.config.js')
+  // if config not existed copy that
+  const jest = path.resolve(getPackageRoot('jest'), 'bin', 'jest')
+  execSync(`NODE_OPTIONS=--experimental-vm-modules node ${jest} ${argv.join(' ')}`, { stdio: 'inherit' })
+}

package/src/commands/run-upload.ts

@@ -1,16 +1,16 @@
 import commandLineArgs from 'command-line-args'
 import commandLineUsage from 'command-line-usage'
-import { finalizeHost, FinalizeProjectName, SentioProjectConfig } from '../config'
+import { finalizeHost, FinalizeProjectName, SentioProjectConfig } from '../config.js'
 import { URL } from 'url'
 import fetch from 'node-fetch'
-import { buildProcessor } from '../build'
+import { buildProcessor } from '../build.js'
 import chalk from 'chalk'
 import path from 'path'
-import { ReadKey } from '../key'
+import { ReadKey } from '../key.js'
 import fs from 'fs'
 import { createHash } from 'crypto'
 import { execSync } from 'child_process'
-import { getSdkVersion } from '../utils'
+import { getSdkVersion } from '../utils.js'
 import readline from 'readline'
 
 export async function runUpload(processorConfig: SentioProjectConfig, argv: string[]) {
@@ -85,7 +85,7 @@ export async function runUpload(processorConfig: SentioProjectConfig, argv: stri
 async function createProject(options: SentioProjectConfig, apiKey: string) {
   const url = new URL('/api/v1/projects', options.host)
   const [ownerName, slug] = options.project.includes('/') ? options.project.split('/') : [undefined, options.project]
-  return fetch(url, {
+  return fetch(url.href, {
     method: 'POST',
     headers: {
       'api-key': apiKey,
@@ -144,8 +144,8 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
     // get gcs upload url
     const initUploadResRaw = await initUpload(options.host, apiKey, options.project, getSdkVersion())
     if (!initUploadResRaw.ok) {
-      console.error(chalk.red('Failed to get upload url'))
-      console.error(chalk.red((await initUploadResRaw.json()).message))
+      // console.error(chalk.red('Failed to get upload url'))
+      console.error(chalk.red(((await initUploadResRaw.json()) as { message: string }).message))
 
       if (initUploadResRaw.status === 404) {
         // create project if not exist
@@ -162,7 +162,7 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
             const res = await createProject(options, apiKey)
             if (!res.ok) {
               console.error(chalk.red('Create Project Failed'))
-              console.error(chalk.red((await res.json()).message))
+              console.error(chalk.red(((await res.json()) as { message: string }).message))
               return
             }
             console.log(chalk.green('Project created'))
@@ -177,8 +177,8 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
       }
       return
     }
-    const initUploadRes = await initUploadResRaw.json()
-    const uploadUrl = initUploadRes['url'] as string
+    const initUploadRes = (await initUploadResRaw.json()) as { url: string }
+    const uploadUrl = initUploadRes.url
 
     // do actual uploading
     const file = fs.createReadStream(PROCESSOR_FILE)
@@ -217,7 +217,10 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
     if (commitSha) {
       console.log('\t', chalk.blue('Git commit SHA:'), commitSha)
     }
-    const { projectFullSlug, version } = await finishUploadResRaw.json()
+    const { projectFullSlug, version } = (await finishUploadResRaw.json()) as {
+      projectFullSlug: string
+      version: string
+    }
     console.log('\t', chalk.blue('Check status:'), `${options.host}/${projectFullSlug}/datasource`)
     console.log('\t', chalk.blue('Version:'), version)
   }
@@ -246,7 +249,7 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
 
 async function initUpload(host: string, apiKey: string, projectSlug: string, sdkVersion: string) {
   const initUploadUrl = new URL(`/api/v1/processors/init_upload`, host)
-  return fetch(initUploadUrl, {
+  return fetch(initUploadUrl.href, {
     method: 'POST',
     headers: {
       'api-key': apiKey,
@@ -269,7 +272,7 @@ async function finishUpload(
   debug: boolean
 ) {
   const finishUploadUrl = new URL(`/api/v1/processors/finish_upload`, host)
-  return fetch(finishUploadUrl, {
+  return fetch(finishUploadUrl.href, {
     method: 'POST',
     headers: {
       'api-key': apiKey,

package/src/commands/run-version.ts

@@ -1,6 +1,6 @@
 import commandLineArgs from 'command-line-args'
 import commandLineUsage from 'command-line-usage'
-import { getCliVersion, getSdkVersion } from '../utils'
+import { getCliVersion, getSdkVersion } from '../utils.js'
 import * as console from 'console'
 
 export function runVersion(argv: string[]) {

package/src/index.ts

@@ -0,0 +1 @@
+export {}

package/src/utils.ts

@@ -1,8 +1,23 @@
 import fs from 'fs-extra'
 import path from 'path'
+import { createRequire } from 'module'
+import url from 'url'
+
+const require = createRequire(import.meta.url)
+const PACKAGE_JSON = 'package.json'
+
+export function getPackageRoot(pkgId: string): string {
+  const m = require.resolve(pkgId)
+
+  let dir = path.dirname(m)
+  while (!fs.existsSync(path.join(dir, PACKAGE_JSON))) {
+    dir = path.dirname(dir)
+  }
+  return dir
+}
 
 export function getCliVersion() {
-  const packageJsonPath = path.resolve(__dirname, '../package.json')
+  const packageJsonPath = url.fileURLToPath(new URL('../' + PACKAGE_JSON, import.meta.url))
   const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8')
   const packageJson = JSON.parse(packageJsonContent)
 
@@ -11,8 +26,8 @@ export function getCliVersion() {
 
 export function getSdkVersion() {
   try {
-    const packageJsonPath = require.resolve('@sentio/sdk/package.json')
-    const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8')
+    const packageJsonPath = getPackageRoot('@sentio/sdk')
+    const packageJsonContent = fs.readFileSync(path.join(packageJsonPath, PACKAGE_JSON), 'utf-8')
     const packageJson = JSON.parse(packageJsonContent)
     return packageJson.version
   } catch (e) {

package/templates/aptos/jest.config.ts

@@ -0,0 +1,8 @@
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
+export default {
+  preset: 'ts-jest/presets/default-esm',
+  modulePathIgnorePatterns: ['<rootDir>/dist/'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
+}

package/templates/aptos/package.json

@@ -2,20 +2,17 @@
   "name": "template-aptos",
   "private": true,
   "version": "1.0.0",
+  "type": "module",
   "scripts": {
-    "test": "jest",
+    "test": "sentio test",
     "gen": "sentio gen",
     "build": "sentio build",
     "upload": "sentio upload"
   },
   "dependencies": {
-    "@sentio/sdk": "^2.0.0-development",
-    "@sentio/sdk-aptos": "^2.0.0-development"
+    "@sentio/sdk": "^2.0.0-development"
   },
   "devDependencies": {
-    "@types/jest": "^29.0.0",
-    "jest": "^29.0.0",
-    "ts-jest": "^29.0.0",
     "typescript": "^4.9.0"
   }
 }

package/templates/aptos/src/processor.ts

@@ -1,13 +1,13 @@
-import { SouffleChefCampaign, CandyMachine } from './types/aptos/souffle'
+import { SouffleChefCampaign, CandyMachine } from './types/aptos/souffle.js'
 
 SouffleChefCampaign.bind()
   .onEntryPullTokenV2((call, ctx) => {
-    ctx.meter.Counter('pulled').add(call.arguments_typed[3])
+    ctx.meter.Counter('pulled').add(call.arguments_decoded[3])
   })
   .onEventBurnEnjoyEvent((evt, ctx) => {
     ctx.meter.Counter('burned').add(1)
   })
 
 CandyMachine.bind().onEntryPullToken((call, ctx) => {
-  ctx.meter.Counter('pulled').add(call.arguments_typed[2], { coin: call.type_arguments[0] })
+  ctx.meter.Counter('pulled').add(call.arguments_decoded[2], { coin: call.type_arguments[0] })
 })

package/templates/aptos/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "importHelpers": true,
     "alwaysStrict": true,
     "sourceMap": true,
     "target": "esnext",
@@ -7,14 +8,14 @@
     "noImplicitReturns": true,
     "noImplicitAny": true,
     "module": "esnext",
-    "moduleResolution": "node16",
+    "moduleResolution": "nodenext",
     "strictNullChecks": true,
     "stripInternal": true,
     "noFallthroughCasesInSwitch": true,
     "noEmitOnError": true,
-    "outDir": "dist",
     "rootDir": "./src",
+    "outDir": "./dist",
     "skipLibCheck": true
   },
-  "exclude": ["dist"]
+  "exclude": ["dist", "jest.config.ts"]
 }

package/templates/evm/jest.config.ts

@@ -0,0 +1,8 @@
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
+export default {
+  preset: 'ts-jest/presets/default-esm',
+  modulePathIgnorePatterns: ['<rootDir>/dist/'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
+}

package/templates/evm/package.json

@@ -2,8 +2,9 @@
   "name": "template-evm",
   "private": true,
   "version": "1.0.0",
+  "type": "module",
   "scripts": {
-    "test": "jest",
+    "test": "sentio test",
     "gen": "sentio gen",
     "build": "sentio build",
     "upload": "sentio upload"
@@ -12,9 +13,6 @@
     "@sentio/sdk": "^2.0.0-development"
   },
   "devDependencies": {
-    "@types/jest": "^29.0.0",
-    "jest": "^29.0.0",
-    "ts-jest": "^29.0.0",
     "typescript": "^4.9.0"
   }
 }

package/templates/evm/src/processor.ts

@@ -1,7 +1,6 @@
 import { Counter, Gauge } from '@sentio/sdk'
-import { token } from '@sentio/sdk/lib/utils'
-import { ERC20Processor } from '@sentio/sdk/lib/builtin/erc20'
-import { X2y2Processor } from './types/x2y2'
+import { ERC20Processor } from '@sentio/sdk/eth/builtin'
+import { X2y2Processor } from './types/x2y2/index.js'
 
 const rewardPerBlock = Gauge.register('reward_per_block', {
   description: 'rewards for each block grouped by phase',
@@ -11,7 +10,7 @@ const tokenCounter = Counter.register('token')
 
 X2y2Processor.bind({ address: '0xB329e39Ebefd16f40d38f07643652cE17Ca5Bac1' }).onBlockInterval(async (_, ctx) => {
   const phase = (await ctx.contract.currentPhase()).toString()
-  const reward = token.scaleDown(await ctx.contract.rewardPerBlockForStaking(), 18)
+  const reward = (await ctx.contract.rewardPerBlockForStaking()).scaleDown(18)
   rewardPerBlock.record(ctx, reward, { phase })
 })
 
@@ -22,7 +21,7 @@ const filter = ERC20Processor.filters.Transfer(
 
 ERC20Processor.bind({ address: '0x1e4ede388cbc9f4b5c79681b7f94d36a11abebc9' }).onEventTransfer(
   async (event, ctx) => {
-    const val = token.scaleDown(event.args.value, 18)
+    const val = event.args.value.scaleDown(18)
     tokenCounter.add(ctx, val)
   },
   filter // filter is an optional parameter

package/templates/evm/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "importHelpers": true,
     "alwaysStrict": true,
     "sourceMap": true,
     "target": "esnext",
@@ -7,14 +8,14 @@
     "noImplicitReturns": true,
     "noImplicitAny": true,
     "module": "esnext",
-    "moduleResolution": "node16",
+    "moduleResolution": "nodenext",
     "strictNullChecks": true,
     "stripInternal": true,
     "noFallthroughCasesInSwitch": true,
     "noEmitOnError": true,
-    "outDir": "dist",
     "rootDir": "./src",
+    "outDir": "./dist",
     "skipLibCheck": true
   },
-  "exclude": ["dist"]
+  "exclude": ["dist", "jest.config.ts"]
 }

package/templates/raw/jest.config.ts

@@ -0,0 +1,8 @@
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
+export default {
+  preset: 'ts-jest/presets/default-esm',
+  modulePathIgnorePatterns: ['<rootDir>/dist/'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
+}

package/templates/raw/package.json

@@ -2,8 +2,9 @@
   "name": "template-raw",
   "private": true,
   "version": "1.0.0",
+  "type": "module",
   "scripts": {
-    "test": "jest",
+    "test": "sentio test",
     "gen": "sentio gen",
     "build": "sentio build",
     "upload": "sentio upload"
@@ -12,9 +13,6 @@
     "@sentio/sdk": "^2.0.0-development"
   },
   "devDependencies": {
-    "@types/jest": "^29.0.0",
-    "jest": "^29.0.0",
-    "ts-jest": "^29.0.0",
     "typescript": "^4.9.0"
   }
 }

package/templates/raw/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "importHelpers": true,
     "alwaysStrict": true,
     "sourceMap": true,
     "target": "esnext",
@@ -7,14 +8,14 @@
     "noImplicitReturns": true,
     "noImplicitAny": true,
     "module": "esnext",
-    "moduleResolution": "node16",
+    "moduleResolution": "nodenext",
     "strictNullChecks": true,
     "stripInternal": true,
     "noFallthroughCasesInSwitch": true,
     "noEmitOnError": true,
-    "outDir": "dist",
     "rootDir": "./src",
+    "outDir": "./dist",
     "skipLibCheck": true
   },
-  "exclude": ["dist"]
+  "exclude": ["dist", "jest.config.ts"]
 }

package/templates/solana/jest.config.ts

@@ -0,0 +1,8 @@
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
+export default {
+  preset: 'ts-jest/presets/default-esm',
+  modulePathIgnorePatterns: ['<rootDir>/dist/'],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
+}

package/templates/solana/package.json

@@ -2,20 +2,17 @@
   "name": "template-solana",
   "private": true,
   "version": "1.0.0",
+  "type": "module",
   "scripts": {
-    "test": "jest",
+    "test": "sentio test",
     "gen": "sentio gen",
     "build": "sentio build",
     "upload": "sentio upload"
   },
   "dependencies": {
-    "@sentio/sdk": "^2.0.0-development",
-    "@sentio/sdk-solana": "^2.0.0-development"
+    "@sentio/sdk": "^2.0.0-development"
   },
   "devDependencies": {
-    "@types/jest": "^29.0.0",
-    "jest": "^29.0.0",
-    "ts-jest": "^29.0.0",
     "typescript": "^4.9.0"
   }
 }

package/templates/solana/src/processor.ts

@@ -1,4 +1,4 @@
-import { SPLTokenProcessor } from '@sentio/sdk-solana/lib/builtin'
+import { SPLTokenProcessor } from '@sentio/sdk/solana/builtin'
 
 SPLTokenProcessor.bind({
   address: 'wormDTUJ6AWPNvk59vGQbDvGJmqbDTdgWgAqcLBCgUb',
@@ -6,11 +6,11 @@ SPLTokenProcessor.bind({
 })
   .onMintTo((data, ctx) => {
     if (data.mint === '7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs') {
-      ctx.meter.Counter('totalWeth_supply').add(data.amount as number)
+      ctx.meter.Counter('totalWeth_supply').add(data.amount)
     }
   })
   .onBurn((data, ctx) => {
     if (data.mint === '7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs') {
-      ctx.meter.Counter('totalWeth_supply').sub(data.amount as number)
+      ctx.meter.Counter('totalWeth_supply').sub(data.amount)
     }
   })

package/templates/solana/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "importHelpers": true,
     "alwaysStrict": true,
     "sourceMap": true,
     "target": "esnext",
@@ -7,14 +8,14 @@
     "noImplicitReturns": true,
     "noImplicitAny": true,
     "module": "esnext",
-    "moduleResolution": "node16",
+    "moduleResolution": "nodenext",
     "strictNullChecks": true,
     "stripInternal": true,
     "noFallthroughCasesInSwitch": true,
     "noEmitOnError": true,
-    "outDir": "dist",
     "rootDir": "./src",
+    "outDir": "./dist",
     "skipLibCheck": true
   },
-  "exclude": ["dist"]
+  "exclude": ["dist", "jest.config.ts"]
 }

package/lib/webpack.config.js

@@ -1,50 +0,0 @@
-/* eslint-disable */
-const path = require('path')
-
-module.exports = {
-  entry: {
-    lib: './src/processor.ts',
-  },
-  devtool: 'inline-source-map',
-  module: {
-    rules: [
-      {
-        test: /\.tsx?$/,
-        use: 'ts-loader',
-        exclude: /node_modules/,
-      },
-    ],
-  },
-  resolve: {
-    extensions: ['.ts', '.js'],
-  },
-  output: {
-    filename: '[name].js',
-    path: path.resolve(process.cwd(), 'dist'),
-  },
-  target: 'node',
-  mode: 'production',
-  externals: [
-    {
-      protobufjs: 'commonjs2 protobufjs',
-      aptos: 'commonjs2 aptos-sdk',
-      ethers: 'commonjs2 ethers',
-      bs58: 'commonjs2 bs58',
-      "bignumber.js": 'commonjs2 bignumber.js',
-      'bn.js': 'commonjs2 bn.js',
-      'csv-parse': 'commonjs2 csv-parse',
-    },
-    function ({ context, request }, callback) {
-      if (/^@(ethersproject|solana|project-serum|nice-grpc).*$/.test(request)) {
-        return callback(null, 'commonjs ' + request)
-      }
-      if (/^nice-grpc.*$/.test(request)) {
-        return callback(null, 'commonjs ' + request)
-      }
-      if (/^@sentio\/(sdk|runtime|base|protos|bigdecimal).*$/.test(request)) {
-        return callback(null, 'commonjs ' + request)
-      }
-      callback()
-    },
-  ],
-}