@tremho/mist-lift 2.2.1 → 2.2.3

package/src/commands/deploy.ts

@@ -68,12 +68,16 @@ export async function doDeployAsync (
     })
   }
 
+  // console.log(ac.gray.dim('>> beginning loop in doDeployAsync '))
+
   for (const funcName of funcsToDeploy) {
     const zipFile = path.join(projectPaths.basePath, 'MistLift_Zips', funcName + '.zip')
     if (fs.existsSync(zipFile)) {
       const zipTime = fs.statSync(zipFile).mtime
       if (zipTime.getTime() > (deploymentRecord[funcName] ?? 0)) {
+        // console.log(ac.gray.dim('>> calling deployPackage '))
         await deployPackage(funcName)
+        // console.log(ac.gray.dim('>> recording result '))
         deploymentRecord[funcName] = Date.now()
       }
     } else {
@@ -84,6 +88,7 @@ export async function doDeployAsync (
 
   try { fs.writeFileSync(deploymentRecordPath, JSON.stringify(deploymentRecord)) } catch {}
 
+  // console.log(ac.gray.dim('>> returning from doDeployAsync '))
   return 0
 }
 
@@ -132,10 +137,13 @@ export async function deployPackage (
     const principal = parts[4]
     await AddPermissions(client, dFuncName, principal)
     let deployMsg: string = `Successfully deployed ${funcName}`
+    // console.log(ac.gray.dim('>> deploy trace 1'))
     if (memorySize > 0 || timeout > 0) {
+      // console.log(ac.gray.dim('>> deploy trace 1a'))
       deployMsg += ac.grey.italic(' with ')
       const useAnd = memorySize > 9 && timeout > 0
       if (memorySize > 0) {
+        // console.log(ac.gray.dim('>> deploy trace 1b'))
         deployMsg += ac.grey(`memorySize ${memorySize}mb`)
         if (useAnd) deployMsg += ac.grey.italic(' and ')
       }
@@ -143,11 +151,13 @@ export async function deployPackage (
         deployMsg += ac.grey(`timeout ${timeout} seconds`)
       }
     }
+    // console.log(ac.gray.dim('>> deploy trace 2'))
 
     console.log(ac.green.bold(deployMsg))
   } catch (e: any) {
     console.error(ac.red.bold.italic('Error deploying ' + funcName), e)
   }
+  // console.log(ac.gray.dim('>> deploy trace 3'))
 }
 async function CreateCloudFunction (
   funcName: string,

package/src/commands/doctor.ts

@@ -5,6 +5,8 @@ import { executeCommand } from '../lib/executeCommand'
 import { resolvePaths } from '../lib/pathResolve'
 import { areSettingsAvailable } from '../lib/LiftConfig'
 
+const minTapVersion = '19.2.5'
+
 export async function doDoctor (): Promise<boolean> {
   console.log(ac.blue.bold('Lift doctor'))
 
@@ -26,6 +28,11 @@ export async function doDoctor (): Promise<boolean> {
   ok = ok && report('Npm', npmVersion, isWin ? '9.6.4' : '10.3.0')
   report('Git', gitVersion, '2.0.0')
   report('unzip', unzipVersion, '1.0.0')
+
+  if (!await isTapInstalled()) {
+    console.log(ac.yellow.dim.bold.italic('\nTap is necessary for the lift test command.\nInstall with ') + ac.black.bold('npm i -g tap\n'))
+  }
+
   if (!settingsAvail) {
     console.log('')
     console.log(ac.yellow.dim.bold('Cloud Settings are not set. ') + ac.blue('run ' + ac.bold('lift settings')))
@@ -81,6 +88,13 @@ async function fetchNpmVersion (
   return vstr
 }
 
+async function fetchTapVersion (): Promise<string> {
+  const result = await executeCommand('tap', ['-v'])
+  if (result.retcode !== 0) return 'Tap not found'
+  const vstr = versionTrim(result.stdStr)
+  return vstr
+}
+
 async function fetchGitVersion (
 
 ): Promise<string> {
@@ -116,3 +130,8 @@ function report (
   }
   return ok
 }
+
+export async function isTapInstalled (): Promise<boolean> {
+  const v = await fetchTapVersion()
+  return report('tap', v, minTapVersion)
+}

package/src/commands/publish.ts

@@ -27,7 +27,7 @@ import { delay } from '../lib/utils'
 import { addBuiltInDefinitions, MakeBuiltinApiDoc } from './builtin/ApiDocMaker'
 import { DeployApiBuiltin, DeployRootFileserves, DeployWebrootBuiltIn } from './builtin/BuiltInHandler'
 import { esbuilder } from '../lib/ESBuild'
-import { decoratedName, getIdDelimiter } from '../lib/IdSrc'
+import { getIdSrc, getIdDelimiter } from '../lib/IdSrc'
 
 let projectPaths: any
 
@@ -53,19 +53,24 @@ async function publishApi (
   if (stageName === undefined) stageName = 'Dev'
   console.log(ac.green.bold(`Publishing Api to ${stageName}`))
 
-  // console.log('esbuild...')
-  await esbuilder()
-  // console.log('done')
+  // console.log(ac.gray.dim('>> esbuilder '))
+  await esbuilder(null, true)
   // do the built-in deploys
+  // console.log(ac.gray.dim('>> webroot '))
   await DeployWebrootBuiltIn()
+  // console.log(ac.gray.dim('>> fileserves '))
   await DeployRootFileserves()
+  // console.log(ac.gray.dim('>> api built in '))
   await DeployApiBuiltin()
+  // console.log(ac.gray.dim('>> past api built in '))
 
   // make a private api
   // const fs = require('fs')
   // const os = require('os')
   // const path = require('path')
 
+  // console.log(ac.gray.dim('>> create staging folder '))
+
   let tmpDir
   let apiBytes
   const appPrefix = 'MistLift'
@@ -75,7 +80,9 @@ async function publishApi (
     mkdirSync(tmpDir, { recursive: true })
 
     const yamlFile = path.join(tmpDir, 'papi.yaml')
+    // console.log(ac.gray.dim('>> Make builtin ApiDoc '))
     await MakeBuiltinApiDoc(yamlFile)
+    // console.log(ac.gray.dim('>> Past making builtin ApiDoc '))
     // console.log("reading "+yamlFile)
     apiBytes = fs.readFileSync(yamlFile)
   } catch (e: any) {
@@ -90,9 +97,11 @@ async function publishApi (
       console.error(`An error has occurred while removing the temp folder at ${tmpDir ?? ''}. Please remove it manually. Error: ${(e.message as string)}`)
     }
   }
+  // console.log(ac.gray.dim('>> past that part, onto API Gateway '))
 
   const client = new APIGatewayClient(getAWSCredentials())
 
+  // console.log(ac.gray.dim('>> remove Existing versions '))
   await RemoveExistingVersions(client)
 
   const command: any = new ImportRestApiCommand({
@@ -123,15 +132,17 @@ async function publishApi (
 
   console.log(ac.grey('Continuing with binding...'))
   const prereq = await PrequisiteValues(apiId ?? '')
+  // console.log(ac.gray.dim('>> making intRequests'))
   const intRequests = prereq.MakeRequests()
+  // console.log(ac.magenta.dim('>> putting integration'), intRequests)
   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)
-  // process.exit(0) // this was a dumb idea
 }
+
 function findApiName (): string {
   const infoFile = path.join(projectPaths.functionPath, 'apiService.info.json')
   const pkgFile = projectPaths.packagePath
@@ -198,7 +209,7 @@ class PrereqInfo {
       if (api?.path === pathMap) {
         // console.log("resourceMethods", api.resourceMethods)
         const methodList: string[] = Object.getOwnPropertyNames(api.resourceMethods)
-        // ClogTrace("methodList", methodList)
+        // console.log("methodList", methodList)
         for (const meth of allowedMethods.toUpperCase().split(',')) { // NOTE: we no longer try to support multiples, but this still works as is.
           // console.log("meth", meth)
           if (methodList.includes(meth)) {
@@ -212,9 +223,11 @@ class PrereqInfo {
   }
 
   public findARN (name: string): string {
-    // console.warn(`>>> finding name ${name} in functions ${JSON.stringify(this.functions)}`)
+    let lastus = name.lastIndexOf(getIdDelimiter())
+    if (lastus !== -1) name = name.substring(0, lastus)
+    // console.warn(`>>> finding name ${name} in ${this.functions.length} functions`)
     for (const f of this.functions ?? []) {
-      const lastus = f.name.lastIndexOf(getIdDelimiter())
+      lastus = f.name.lastIndexOf(getIdDelimiter())
       const fname = f.name.substring(0, lastus)
       // console.warn('comparing name, fname, lc ', {lastus, fname, name})
       if (fname.toLowerCase() === name.toLowerCase()) {
@@ -222,21 +235,26 @@ class PrereqInfo {
         return f.arn
       }
     }
-    console.log("$$$ Couldn't find " + name + ' in ', this.functions)
+    console.error(ac.red.bold("$$ Couldn't find " + name + ' in integration list'))
+    process.exit(1)
     return ''
   }
 
   public MakeRequests (): PutIntegrationRequest[] {
     const region = getSettings()?.awsPreferredRegion ?? ''
     const out: PutIntegrationRequest[] = []
+
     for (const d of this.defs) {
       const def = (d)
+      // console.log(ac.magenta.dim('>> finding api and arn for '), {pathMap:def.pathMap, name: def.name})
       const api = this.findApi(def.pathMap, def.method)
       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)}`)
+        console.log(ac.red.dim(`>>> No ARN for ${(def.name as string)} ${(def.pathMap as string)}, ${(api.id as string)}`))
+        process.exit(1)
       }
-      if (api !== undefined) {
+      // console.log(ac.magenta.dim.italic('>> api for '+arn), api)
+      if (api !== null && api !== undefined && arn !== '') {
         out.push({
           restApiId: this.requestApiId,
           resourceId: api.id, // api.parentId
@@ -268,11 +286,13 @@ async function GetFunctionInfo (info: PrereqInfo): Promise<PrereqInfo> {
   const listCommand: any = new ListFunctionsCommand({})
   const response: any = await client.send(listCommand)
 
-  const sfx = decoratedName('')
+  const sfx = getIdSrc()
 
   for (const func of response.Functions ?? []) {
     const fName: string = func?.FunctionName ?? ''
-    if (fName.endsWith(sfx)) {
+    // console.log(ac.gray.dim('>> checking if '+fName+' has our suffix '+sfx))
+    if (fName.includes(sfx)) {
+      // console.log(ac.gray.dim('>>> Yes'))
       info.functions.push({
         name: func.FunctionName ?? '',
         arn: func.FunctionArn ?? ''
@@ -321,8 +341,8 @@ async function DeployApi (restApiId: string, stageName: string): Promise<void> {
     })
     await client.send(command)
   } catch (e: any) {
-    console.error(ac.red.bold(`Error with deployApi: ${e.message as string}`))
-    throw e
+    console.error(ac.red.bold(`Fatal Error with deployApi: ${e.message as string}`))
+    process.exit(-1)
   }
 }
 

package/src/commands/test.ts

@@ -1,14 +1,23 @@
 import { executeCommand } from '../lib/executeCommand'
 import { doBuildAsync } from './build'
+import { isTapInstalled } from './doctor'
+import * as ac from 'ansi-colors'
 
 export async function doTestAsync (args: string[]): Promise<number> {
   if (await doBuildAsync(args) !== 0) return 1 // don't test if build fails
+
+  if (!await isTapInstalled()) {
+    // don't continue if tap unavaiable
+    console.log(ac.yellow.dim.bold.italic('\nTap is necessary for the lift test command.\nInstall with ') + ac.black.bold('npm i -g tap\n'))
+    return 1
+  }
+
   if (args.length === 0) args = ['*']
   let ret = 0
   for (const funcName of args) {
     const result = await executeCommand('tap', [
-            `build/functions/${funcName}/*.test.js`,
-            /*
+      `functions/${funcName}/*.test.ts`,
+      /*
                              - base -- looks a lot like terse
                              - terse -- pass/fail counts
                              - min -- errors only
@@ -20,11 +29,11 @@ export async function doTestAsync (args: string[]): Promise<number> {
                              - junit
                              - tap
              */
-            '--reporter=base',
-            '--color',
-            '--passes',
-            '--allow-empty-coverage',
-            '--allow-incomplete-coverage'
+      '--reporter=base',
+      '--color',
+      '--passes',
+      '--allow-empty-coverage',
+      '--allow-incomplete-coverage'
 
     ], '', true)
 

package/src/commands/update.ts

@@ -21,7 +21,7 @@ export async function doUpdateAsync (
 
   try {
     // console.warn(">>> esbuilder")
-    await esbuilder()
+    await esbuilder(null, true)
     // console.warn(">>> DeployRootFileserves")
     await DeployRootFileserves()
     // console.warn(">>> DeployWebrootBuiltIn")

package/src/lib/IdSrc.ts

@@ -1,5 +1,6 @@
 
 import { getProjectName, getProjectVersion } from '../lib/LiftVersion'
+import sha1 from 'sha1'
 
 export function getIdDelimiter (): string {
   return '_-_'
@@ -12,5 +13,22 @@ export function getIdSrc (): string {
   return idsrc
 }
 export function decoratedName (name: string): string {
-  return name + getIdDelimiter() + getIdSrc()
+  if (name.includes(getIdDelimiter())) {
+    // console.warn('name '+name+' appears to be decorated already')
+    return name
+  }
+
+  while (name.includes('/')) name = name.replace('/', '')
+
+  const hash8 = sha1(name.toLowerCase()).toString().substring(0, 8)
+
+  const fullName = name + getIdDelimiter() + getIdSrc()
+  let dname
+  if (name.startsWith('fileserve_')) {
+    dname = ('fileServe_' + hash8 + getIdDelimiter() + getIdSrc()).substring(0, 64)
+  } else {
+    dname = fullName.substring(0, 50) + '_' + hash8
+  }
+  // console.warn('decorated to '+dname+' from '+name)
+  return dname
 }

package/src/lift.ts

@@ -65,7 +65,7 @@ async function processCommand (): Promise<void> {
       return
     case 'publish': {
       const ret = await doPublishAsync()
-      if (ret !== 0) process.exit(ret)
+      process.exit(ret)
     }
       return
     case 'update': {