@tremho/mist-lift 1.1.4 → 1.1.5

package/src/commands/publish.ts

@@ -1,330 +1,330 @@
-
-import {
-  LambdaClient,
-  ListFunctionsCommand
-} from '@aws-sdk/client-lambda'
-import {
-  APIGatewayClient,
-  ImportRestApiCommand,
-  GetRestApisCommand,
-  GetResourcesCommand, GetResourcesCommandOutput,
-  DeleteRestApiCommand,
-  PutIntegrationRequest,
-  PutIntegrationCommand,
-  CreateDeploymentCommand
-} from '@aws-sdk/client-api-gateway'
-
-import { getAWSCredentials, getSettings } from '../lib/LiftConfig'
-
-import * as ac from 'ansi-colors'
-
-import path from 'path'
-import fs, { mkdirSync } from 'fs'
-import os from 'os'
-import { resolvePaths } from '../lib/pathResolve'
-import { gatherFunctionDefinitions } from '../lib/openAPI/ApiBuildCollector'
-import { delay } from '../lib/utils'
-import { addBuiltInDefinitions, MakeBuiltinApiDoc } from './builtin/ApiDocMaker'
-import { DeployApiBuiltin, DeployRootFileserves, DeployWebrootBuiltIn } from './builtin/BuiltInHandler'
-import { getProjectName, getProjectVersion } from '../lib/LiftVersion'
-import md5 from 'md5'
-
-let projectPaths: any
-
-export async function doPublishAsync (stageName?: string): Promise<number> {
-  // let retCode = await doDeployAsync([])
-  // if(retCode) return retCode
-  const retCode = 0
-
-  projectPaths = resolvePaths()
-  if (projectPaths.verified !== true) {
-    console.log(ac.bold.magenta('current directory is not at project root'))
-    return -1
-  }
-
-  await publishApi(stageName ?? 'Dev')
-
-  return retCode
-}
-
-async function publishApi (
-  stageName?: string
-): Promise<void> {
-  if (stageName === undefined) stageName = 'Dev'
-  console.log(ac.green.bold(`Publishing Api to ${stageName}`))
-
-  // do the built-in deploys
-  await DeployWebrootBuiltIn()
-  await DeployRootFileserves()
-  await DeployApiBuiltin()
-
-  // make a private api
-  // const fs = require('fs')
-  // const os = require('os')
-  // const path = require('path')
-
-  let tmpDir
-  let apiBytes
-  const appPrefix = 'MistLift'
-  try {
-    tmpDir = path.join(os.tmpdir(), appPrefix)
-    // console.log("making "+tmpDir)
-    mkdirSync(tmpDir, { recursive: true })
-
-    const yamlFile = path.join(tmpDir, 'papi.yaml')
-    await MakeBuiltinApiDoc(yamlFile)
-    // console.log("reading "+yamlFile)
-    apiBytes = fs.readFileSync(yamlFile)
-  } catch (e: any) {
-    console.error(ac.red.bold('Error creating temp staging folder ') + (e.message as string))
-    throw Error()
-  } finally {
-    try {
-      if (tmpDir !== undefined) {
-        fs.rmSync(tmpDir, { recursive: true })
-      }
-    } catch (e: any) {
-      console.error(`An error has occurred while removing the temp folder at ${tmpDir ?? ''}. Please remove it manually. Error: ${(e.message as string)}`)
-    }
-  }
-
-  const client = new APIGatewayClient(getAWSCredentials())
-
-  await RemoveExistingVersions(client)
-
-  const command = new ImportRestApiCommand({
-    failOnWarnings: false,
-    body: apiBytes
-  })
-  let apiId
-  try {
-    const response = await client.send(command)
-    const { name, id, version, warnings } = response
-    console.log(ac.grey(`\n\nAPI ${name ?? ''} version ${version ?? ''}  [${id ?? ''}] schema created`))
-    apiId = id ?? ''
-    if (warnings?.length !== 0) {
-      console.log(ac.magenta(` with ${warnings?.length ?? 0} warnings`))
-      if (warnings !== undefined) {
-        for (const warning of warnings) {
-          console.log(ac.grey.italic(`    ${warning}`))
-        }
-      }
-    }
-  } catch (e: any) {
-    console.error(ac.bold.red(e.message))
-  }
-  // const apidoc = new TextDecoder().decode(apiBytes)
-  // console.log(apidoc)
-  if (apiId === '') return
-
-  console.log(ac.grey('Continuing with binding...'))
-  const prereq = await PrequisiteValues(apiId ?? '')
-  const intRequests = prereq.MakeRequests()
-  await PutIntegrations(intRequests)
-  await DeployApi(apiId ?? '', stageName)
-  const region = getSettings()?.awsPreferredRegion ?? ''
-  const publishUrl = `https://${apiId ?? ''}.execute-api.${region}.amazonaws.com/${stageName}`
-  console.log(ac.green.bold(`\n Successfully deployed to ${publishUrl}`))
-  recordLatestPublish(publishUrl)
-}
-function findApiName (): string {
-  const infoFile = path.join(projectPaths.functionPath, 'apiService.info.json')
-  const pkgFile = projectPaths.packagePath
-  let pkg: any = {}
-  if (fs.existsSync(pkgFile)) { pkg = JSON.parse(fs.readFileSync(pkgFile).toString()) }
-  let info: any = {}
-  if (fs.existsSync(infoFile)) { info = JSON.parse(fs.readFileSync(infoFile).toString()) }
-
-  return info.title ?? pkg.name ?? 'API'
-}
-
-async function RemoveExistingVersions (client: APIGatewayClient): Promise<void> {
-  await new Promise(resolve => {
-    const ourName = findApiName()
-    // ClogDebug("looking for name "+ ourName)
-    const listCommand = new GetRestApisCommand({})
-    client.send(listCommand).then((response: any) => {
-      // ClogInfo(`There are ${response.items.length} other APIs`)
-
-      const DeleteMatchingApis = async (i: number = 0): Promise<any> => {
-        if (i >= response.items.length) {
-          resolve(undefined)
-          return await Promise.resolve(undefined)
-        }
-        const item: { name: string, id: string } = response.items[i]
-        if (item.name === ourName) {
-          // ClogInfo(`Found previous ${ourName}, [${item.id}] -- deleting...`)
-          const deleteCommand = new DeleteRestApiCommand({
-            restApiId: item.id
-          })
-          return await client.send(deleteCommand).then(() => {
-            delay(5000).then(async () => {
-              console.log(ac.magenta.bold(`Removed previous id ${item.id}`))
-              return await DeleteMatchingApis(++i)
-            }).catch<any>((reason: any) => undefined)
-          }).catch<any>((reason: any) => undefined)
-        } else {
-          return await DeleteMatchingApis(++i)
-        }
-      }
-      DeleteMatchingApis().catch<any>((reason: any) => undefined)
-    }).catch<any>((reason: any) => undefined)
-  }).catch<any>((reason: any) => undefined)
-}
-
-class FunctionInfo {
-  name: string = ''
-  arn: string = ''
-}
-
-class PrereqInfo {
-  requestApiId: string = ''
-  functions: FunctionInfo[] = []
-  apis: any[] = [] // Resource + method
-  defs: any[] = []
-
-  public constructor () {
-    this.functions = []
-    this.apis = []
-    this.defs = []
-  }
-
-  public findApi (pathMap: string, allowedMethods: string): any {
-    // find the pathmap in the apis list
-    // console.log("findApi "+pathMap, allowedMethods)
-    // see that this method exists in method map
-    for (const api of this.apis) {
-      if (api?.path === pathMap) {
-        // console.log("resourceMethods", api.resourceMethods)
-        const methodList = Object.getOwnPropertyNames(api.resourceMethods)
-        // ClogTrace("methodList", methodList)
-        for (const meth of allowedMethods.toUpperCase().split(',')) {
-          // console.log("meth", meth)
-          if (methodList.includes(meth)) {
-            (api).method = meth
-            return api
-          }
-        }
-      }
-    }
-    return null
-  }
-
-  public findARN (name: string): string {
-    for (const f of this.functions ?? []) {
-      const lastus = f.name.lastIndexOf('_')
-      const fname = f.name.substring(0, lastus)
-      if (fname.toLowerCase() === name.toLowerCase()) return f.arn
-    }
-    console.log("$$$ Couldn't find " + name + ' in ', this.functions)
-    return ''
-  }
-
-  public MakeRequests (): PutIntegrationRequest[] {
-    const region = getSettings()?.awsPreferredRegion ?? ''
-    const out: PutIntegrationRequest[] = []
-    for (const d of this.defs) {
-      const def = (d)
-      const api = this.findApi(def.pathMap, def.allowedMethods)
-      const arn = this.findARN(def.name) ?? ''
-      if (arn === '') {
-        console.log(`>>> No ARN for ${(def.name as string)} ${(def.pathMap as string)}, ${(api.id as string)}`)
-      }
-      if (api !== undefined) {
-        out.push({
-          restApiId: this.requestApiId,
-          resourceId: api.id, // api.parentId
-          httpMethod: api.method,
-          integrationHttpMethod: 'POST', // api.method,
-          type: 'AWS_PROXY',
-          uri: `arn:aws:apigateway:${region}:lambda:path/2015-03-31/functions/${arn}/invocations`,
-          credentials: 'arn:aws:iam::545650260286:role/TBDLambdaExecution2'
-        })
-      }
-    }
-    return out
-  }
-}
-
-async function PrequisiteValues (id: string): Promise<PrereqInfo> {
-  const pri = new PrereqInfo()
-  const out = await GetFunctionInfo(pri)
-  out.defs = gatherFunctionDefinitions()
-  addBuiltInDefinitions(out.defs)
-  out.requestApiId = id
-  await GetMethodResources(id, out)
-
-  return out
-}
-
-async function GetFunctionInfo (info: PrereqInfo): Promise<PrereqInfo> {
-  const client = new LambdaClient(getAWSCredentials())
-  const listCommand: any = new ListFunctionsCommand({})
-  const response: any = await client.send(listCommand)
-
-  const sfx = '_' + md5((getProjectName() ?? '') + (getProjectVersion()?.toString() ?? ''))
-
-  for (const func of response.Functions ?? []) {
-    const fName: string = func?.FunctionName ?? ''
-    if (fName.endsWith(sfx)) {
-      info.functions.push({
-        name: func.FunctionName ?? '',
-        arn: func.FunctionArn ?? ''
-      })
-    }
-  }
-  return info
-}
-
-async function GetMethodResources (
-  id: string,
-  info: PrereqInfo
-): Promise<PrereqInfo> {
-  const client = new APIGatewayClient(getAWSCredentials())
-  const listCommand = new GetResourcesCommand({
-    restApiId: id
-  })
-  const response: GetResourcesCommandOutput = await client.send(listCommand)
-  // ClogInfo("Resources response", response)
-  if ((response?.items) != null) info.apis = response.items
-
-  return info
-}
-
-async function PutIntegrations (integrations: PutIntegrationRequest[]): Promise<void> {
-  const client = new APIGatewayClient(getAWSCredentials())
-  for (const input of integrations) {
-    try {
-      const command = new PutIntegrationCommand(input)
-      /* const intResp = */ await client.send(command)
-      // ClogDebug("integration response", intResp);
-      await delay(5000)
-    } catch (e: any) {
-      console.error('Problem with integration for ' + (input.uri as string), { input })
-      throw e
-    }
-  }
-}
-
-async function DeployApi (restApiId: string, stageName: string): Promise<void> {
-  try {
-    const client = new APIGatewayClient(getAWSCredentials())
-    const command = new CreateDeploymentCommand({
-      restApiId,
-      stageName
-    })
-    await client.send(command)
-  } catch (e: any) {
-    console.error(ac.red.bold(`Error with deployApi: ${e.message as string}`))
-    throw e
-  }
-}
-
-function recordLatestPublish (publishUrl: string): void {
-  const publishRecord = {
-    url: publishUrl,
-    time: Date.now()
-  }
-  const publishedFile = path.join(projectPaths.basePath, '.published')
-  fs.writeFileSync(publishedFile, JSON.stringify(publishRecord))
-}
+
+import {
+  LambdaClient,
+  ListFunctionsCommand
+} from '@aws-sdk/client-lambda'
+import {
+  APIGatewayClient,
+  ImportRestApiCommand,
+  GetRestApisCommand,
+  GetResourcesCommand, GetResourcesCommandOutput,
+  DeleteRestApiCommand,
+  PutIntegrationRequest,
+  PutIntegrationCommand,
+  CreateDeploymentCommand
+} from '@aws-sdk/client-api-gateway'
+
+import { getAWSCredentials, getSettings } from '../lib/LiftConfig'
+
+import * as ac from 'ansi-colors'
+
+import path from 'path'
+import fs, { mkdirSync } from 'fs'
+import os from 'os'
+import { resolvePaths } from '../lib/pathResolve'
+import { gatherFunctionDefinitions } from '../lib/openAPI/ApiBuildCollector'
+import { delay } from '../lib/utils'
+import { addBuiltInDefinitions, MakeBuiltinApiDoc } from './builtin/ApiDocMaker'
+import { DeployApiBuiltin, DeployRootFileserves, DeployWebrootBuiltIn } from './builtin/BuiltInHandler'
+import { getProjectName, getProjectVersion } from '../lib/LiftVersion'
+import md5 from 'md5'
+
+let projectPaths: any
+
+export async function doPublishAsync (stageName?: string): Promise<number> {
+  // let retCode = await doDeployAsync([])
+  // if(retCode) return retCode
+  const retCode = 0
+
+  projectPaths = resolvePaths()
+  if (projectPaths.verified !== true) {
+    console.log(ac.bold.magenta('current directory is not at project root'))
+    return -1
+  }
+
+  await publishApi(stageName ?? 'Dev')
+
+  return retCode
+}
+
+async function publishApi (
+  stageName?: string
+): Promise<void> {
+  if (stageName === undefined) stageName = 'Dev'
+  console.log(ac.green.bold(`Publishing Api to ${stageName}`))
+
+  // do the built-in deploys
+  await DeployWebrootBuiltIn()
+  await DeployRootFileserves()
+  await DeployApiBuiltin()
+
+  // make a private api
+  // const fs = require('fs')
+  // const os = require('os')
+  // const path = require('path')
+
+  let tmpDir
+  let apiBytes
+  const appPrefix = 'MistLift'
+  try {
+    tmpDir = path.join(os.tmpdir(), appPrefix)
+    // console.log("making "+tmpDir)
+    mkdirSync(tmpDir, { recursive: true })
+
+    const yamlFile = path.join(tmpDir, 'papi.yaml')
+    await MakeBuiltinApiDoc(yamlFile)
+    // console.log("reading "+yamlFile)
+    apiBytes = fs.readFileSync(yamlFile)
+  } catch (e: any) {
+    console.error(ac.red.bold('Error creating temp staging folder ') + (e.message as string))
+    throw Error()
+  } finally {
+    try {
+      if (tmpDir !== undefined) {
+        fs.rmSync(tmpDir, { recursive: true })
+      }
+    } catch (e: any) {
+      console.error(`An error has occurred while removing the temp folder at ${tmpDir ?? ''}. Please remove it manually. Error: ${(e.message as string)}`)
+    }
+  }
+
+  const client = new APIGatewayClient(getAWSCredentials())
+
+  await RemoveExistingVersions(client)
+
+  const command = new ImportRestApiCommand({
+    failOnWarnings: false,
+    body: apiBytes
+  })
+  let apiId
+  try {
+    const response = await client.send(command)
+    const { name, id, version, warnings } = response
+    console.log(ac.grey(`\n\nAPI ${name ?? ''} version ${version ?? ''}  [${id ?? ''}] schema created`))
+    apiId = id ?? ''
+    if (warnings?.length !== 0) {
+      console.log(ac.magenta(` with ${warnings?.length ?? 0} warnings`))
+      if (warnings !== undefined) {
+        for (const warning of warnings) {
+          console.log(ac.grey.italic(`    ${warning}`))
+        }
+      }
+    }
+  } catch (e: any) {
+    console.error(ac.bold.red(e.message))
+  }
+  // const apidoc = new TextDecoder().decode(apiBytes)
+  // console.log(apidoc)
+  if (apiId === '') return
+
+  console.log(ac.grey('Continuing with binding...'))
+  const prereq = await PrequisiteValues(apiId ?? '')
+  const intRequests = prereq.MakeRequests()
+  await PutIntegrations(intRequests)
+  await DeployApi(apiId ?? '', stageName)
+  const region = getSettings()?.awsPreferredRegion ?? ''
+  const publishUrl = `https://${apiId ?? ''}.execute-api.${region}.amazonaws.com/${stageName}`
+  console.log(ac.green.bold(`\n Successfully deployed to ${publishUrl}`))
+  recordLatestPublish(publishUrl)
+}
+function findApiName (): string {
+  const infoFile = path.join(projectPaths.functionPath, 'apiService.info.json')
+  const pkgFile = projectPaths.packagePath
+  let pkg: any = {}
+  if (fs.existsSync(pkgFile)) { pkg = JSON.parse(fs.readFileSync(pkgFile).toString()) }
+  let info: any = {}
+  if (fs.existsSync(infoFile)) { info = JSON.parse(fs.readFileSync(infoFile).toString()) }
+
+  return info.title ?? pkg.name ?? 'API'
+}
+
+async function RemoveExistingVersions (client: APIGatewayClient): Promise<void> {
+  await new Promise(resolve => {
+    const ourName = findApiName()
+    // ClogDebug("looking for name "+ ourName)
+    const listCommand = new GetRestApisCommand({})
+    client.send(listCommand).then((response: any) => {
+      // ClogInfo(`There are ${response.items.length} other APIs`)
+
+      const DeleteMatchingApis = async (i: number = 0): Promise<any> => {
+        if (i >= response.items.length) {
+          resolve(undefined)
+          return await Promise.resolve(undefined)
+        }
+        const item: { name: string, id: string } = response.items[i]
+        if (item.name === ourName) {
+          // ClogInfo(`Found previous ${ourName}, [${item.id}] -- deleting...`)
+          const deleteCommand = new DeleteRestApiCommand({
+            restApiId: item.id
+          })
+          return await client.send(deleteCommand).then(() => {
+            delay(5000).then(async () => {
+              console.log(ac.magenta.bold(`Removed previous id ${item.id}`))
+              return await DeleteMatchingApis(++i)
+            }).catch<any>((reason: any) => undefined)
+          }).catch<any>((reason: any) => undefined)
+        } else {
+          return await DeleteMatchingApis(++i)
+        }
+      }
+      DeleteMatchingApis().catch<any>((reason: any) => undefined)
+    }).catch<any>((reason: any) => undefined)
+  }).catch<any>((reason: any) => undefined)
+}
+
+class FunctionInfo {
+  name: string = ''
+  arn: string = ''
+}
+
+class PrereqInfo {
+  requestApiId: string = ''
+  functions: FunctionInfo[] = []
+  apis: any[] = [] // Resource + method
+  defs: any[] = []
+
+  public constructor () {
+    this.functions = []
+    this.apis = []
+    this.defs = []
+  }
+
+  public findApi (pathMap: string, allowedMethods: string): any {
+    // find the pathmap in the apis list
+    // console.log("findApi "+pathMap, allowedMethods)
+    // see that this method exists in method map
+    for (const api of this.apis) {
+      if (api?.path === pathMap) {
+        // console.log("resourceMethods", api.resourceMethods)
+        const methodList = Object.getOwnPropertyNames(api.resourceMethods)
+        // ClogTrace("methodList", methodList)
+        for (const meth of allowedMethods.toUpperCase().split(',')) {
+          // console.log("meth", meth)
+          if (methodList.includes(meth)) {
+            (api).method = meth
+            return api
+          }
+        }
+      }
+    }
+    return null
+  }
+
+  public findARN (name: string): string {
+    for (const f of this.functions ?? []) {
+      const lastus = f.name.lastIndexOf('_')
+      const fname = f.name.substring(0, lastus)
+      if (fname.toLowerCase() === name.toLowerCase()) return f.arn
+    }
+    console.log("$$$ Couldn't find " + name + ' in ', this.functions)
+    return ''
+  }
+
+  public MakeRequests (): PutIntegrationRequest[] {
+    const region = getSettings()?.awsPreferredRegion ?? ''
+    const out: PutIntegrationRequest[] = []
+    for (const d of this.defs) {
+      const def = (d)
+      const api = this.findApi(def.pathMap, def.allowedMethods)
+      const arn = this.findARN(def.name) ?? ''
+      if (arn === '') {
+        console.log(`>>> No ARN for ${(def.name as string)} ${(def.pathMap as string)}, ${(api.id as string)}`)
+      }
+      if (api !== undefined) {
+        out.push({
+          restApiId: this.requestApiId,
+          resourceId: api.id, // api.parentId
+          httpMethod: api.method,
+          integrationHttpMethod: 'POST', // api.method,
+          type: 'AWS_PROXY',
+          uri: `arn:aws:apigateway:${region}:lambda:path/2015-03-31/functions/${arn}/invocations`,
+          credentials: 'arn:aws:iam::545650260286:role/TBDLambdaExecution2'
+        })
+      }
+    }
+    return out
+  }
+}
+
+async function PrequisiteValues (id: string): Promise<PrereqInfo> {
+  const pri = new PrereqInfo()
+  const out = await GetFunctionInfo(pri)
+  out.defs = gatherFunctionDefinitions()
+  addBuiltInDefinitions(out.defs)
+  out.requestApiId = id
+  await GetMethodResources(id, out)
+
+  return out
+}
+
+async function GetFunctionInfo (info: PrereqInfo): Promise<PrereqInfo> {
+  const client = new LambdaClient(getAWSCredentials())
+  const listCommand: any = new ListFunctionsCommand({})
+  const response: any = await client.send(listCommand)
+
+  const sfx = '_' + md5((getProjectName() ?? '') + (getProjectVersion()?.toString() ?? ''))
+
+  for (const func of response.Functions ?? []) {
+    const fName: string = func?.FunctionName ?? ''
+    if (fName.endsWith(sfx)) {
+      info.functions.push({
+        name: func.FunctionName ?? '',
+        arn: func.FunctionArn ?? ''
+      })
+    }
+  }
+  return info
+}
+
+async function GetMethodResources (
+  id: string,
+  info: PrereqInfo
+): Promise<PrereqInfo> {
+  const client = new APIGatewayClient(getAWSCredentials())
+  const listCommand = new GetResourcesCommand({
+    restApiId: id
+  })
+  const response: GetResourcesCommandOutput = await client.send(listCommand)
+  // ClogInfo("Resources response", response)
+  if ((response?.items) != null) info.apis = response.items
+
+  return info
+}
+
+async function PutIntegrations (integrations: PutIntegrationRequest[]): Promise<void> {
+  const client = new APIGatewayClient(getAWSCredentials())
+  for (const input of integrations) {
+    try {
+      const command = new PutIntegrationCommand(input)
+      /* const intResp = */ await client.send(command)
+      // ClogDebug("integration response", intResp);
+      await delay(5000)
+    } catch (e: any) {
+      console.error('Problem with integration for ' + (input.uri as string), { input })
+      throw e
+    }
+  }
+}
+
+async function DeployApi (restApiId: string, stageName: string): Promise<void> {
+  try {
+    const client = new APIGatewayClient(getAWSCredentials())
+    const command = new CreateDeploymentCommand({
+      restApiId,
+      stageName
+    })
+    await client.send(command)
+  } catch (e: any) {
+    console.error(ac.red.bold(`Error with deployApi: ${e.message as string}`))
+    throw e
+  }
+}
+
+function recordLatestPublish (publishUrl: string): void {
+  const publishRecord = {
+    url: publishUrl,
+    time: Date.now()
+  }
+  const publishedFile = path.join(projectPaths.basePath, '.published')
+  fs.writeFileSync(publishedFile, JSON.stringify(publishRecord))
+}