@tremho/mist-lift 1.0.2-pre-release.4 → 1.0.2-pre-release.5

package/src/commands/deploy.ts

@@ -1,171 +1,158 @@
 
 import {
-    LambdaClient,
-    CreateFunctionCommand,
-    DeleteFunctionCommand,
-    AddPermissionCommand
-} from "@aws-sdk/client-lambda";
+  LambdaClient,
+  CreateFunctionCommand,
+  DeleteFunctionCommand,
+  AddPermissionCommand
+} from '@aws-sdk/client-lambda'
 
-import md5 from "md5";
+import md5 from 'md5'
 
-import path from "path"
-import fs, {Stats} from "fs"
-import {resolvePaths} from "../lib/pathResolve"
+import path from 'path'
+import fs from 'fs'
+import { resolvePaths } from '../lib/pathResolve'
 
-import * as ac from "ansi-colors"
+import * as ac from 'ansi-colors'
 
-import {doTestAsync} from  "./test"
-import {recurseDirectory} from "../lib/DirectoryUtils"
-import {getLiftVersion, getProjectName, getProjectVersion} from "../lib/LiftVersion"
-import {executeCommand} from "../lib/executeCommand"
-import {isNewerFile} from "../lib/fileCompare"
-import {delay} from "../lib/utils"
-import {doBuildAsync} from "./build";
-import {doPackageAsync} from "./package";
-import {Md5} from "@smithy/md5-js";
-import {getAWSCredentials, getSettings, RuntimeType} from "../lib/LiftConfig";
+import { recurseDirectory } from '../lib/DirectoryUtils'
+import { getProjectName, getProjectVersion } from '../lib/LiftVersion'
+import { delay } from '../lib/utils'
+import { doPackageAsync } from './package'
+import { getAWSCredentials, getSettings, RuntimeType } from '../lib/LiftConfig'
 
-let projectPaths:{basePath: string, buildPath: string, functionPath: string, packagePath: string, verified: boolean}
+let projectPaths: { basePath: string, buildPath: string, functionPath: string, packagePath: string, verified: boolean }
 
-let deploymentRecord:any = {} // a map of last deployment times
+let deploymentRecord: any = {} // a map of last deployment times
 
 // package then deploy
-export async function doDeployAsync(
-    args:string[]
-): Promise<number>
-{
-    projectPaths = resolvePaths()
-
-    const deploymentRecordPath = path.join(projectPaths.basePath, '.deployed')
-    try { deploymentRecord = JSON.parse(fs.readFileSync(deploymentRecordPath).toString()) } catch {}
-
-    // the main package json that has all imports
-    const mainPkgJsonPath = path.join(projectPaths.packagePath)
-    const mainPkgSrc = fs.readFileSync(mainPkgJsonPath).toString()
-    const mainPkgJson = JSON.parse(mainPkgSrc)
-
-    const projectName = getProjectName()
-    const projectVersion = getProjectVersion()
-    const liftVersion = getLiftVersion()
-
-    const funcsToDeploy: string[] = []
-    const options: string[] = []
-    for (let arg of args) {
-        if (arg.charAt(0) == '-') {
-            options.push(arg.toLowerCase())
-        } else funcsToDeploy.push(arg)
+export async function doDeployAsync (
+  args: string[]
+): Promise<number> {
+  projectPaths = resolvePaths()
+
+  const deploymentRecordPath = path.join(projectPaths.basePath, '.deployed')
+  try { deploymentRecord = JSON.parse(fs.readFileSync(deploymentRecordPath).toString()) } catch {}
+
+  const funcsToDeploy: string[] = []
+  const options: string[] = []
+  for (const arg of args) {
+    if (arg.charAt(0) === '-') {
+      options.push(arg.toLowerCase())
+    } else funcsToDeploy.push(arg)
+  }
+
+  if (!options.includes('--no-package')) {
+    const ret = await doPackageAsync(args)
+    if (ret !== 0) return ret
+    else await delay(2500)
+  }
+
+  if (options.includes('--clean')) {
+    deploymentRecord = {}
+  }
+
+  if (funcsToDeploy.length === 0) {
+    let firstDepth = 0
+    recurseDirectory(projectPaths.functionPath, (filepath, stats) => {
+      const depth = filepath.split(path.sep).length
+      if (firstDepth === 0) firstDepth = depth
+      if (stats.isDirectory() && depth === firstDepth) {
+        funcsToDeploy.push(path.basename(filepath))
+      }
+      return false
+    })
+  }
+
+  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)) {
+        await deployPackage(funcName)
+        deploymentRecord[funcName] = Date.now()
+      }
+    } else {
+      console.error('deploy: ' + zipFile + ac.red.bold(` ${funcName} does not exist`))
+      return -1
     }
+  }
 
-    if (options.indexOf("--no-package") === -1) {
-        let ret = await doPackageAsync(args)
-        if (ret) return ret;
-        else await delay(2500);
-    }
-
-    if(options.indexOf("--clean") !== -1) {
-        deploymentRecord = {};
-    }
+  try { fs.writeFileSync(deploymentRecordPath, JSON.stringify(deploymentRecord)) } catch {}
 
-    if (!funcsToDeploy.length) {
-        let firstDepth = 0
-        recurseDirectory(projectPaths.functionPath, (filepath, stats) => {
-            let depth = filepath.split(path.sep).length
-            if (!firstDepth) firstDepth = depth
-            if (stats.isDirectory() && depth == firstDepth) {
-                funcsToDeploy.push(path.basename(filepath))
-            }
-        })
-    }
-
-    const all: Promise<any>[] = [];
-    let error = 0;
-
-    for (let funcName of funcsToDeploy) {
-        // console.log("Deploy "+funcName)
-        const zipFile = path.join(projectPaths.basePath, 'MistLift_Zips', funcName+".zip")
-        if(fs.existsSync(zipFile)) {
-            let zipTime = fs.statSync(zipFile).mtime;
-            if(zipTime.getTime() > (deploymentRecord[funcName] ?? 0)) {
-                await deployPackage(funcName);
-                deploymentRecord[funcName] = Date.now();
-            }
-        } else {
-            console.error("deploy: " +zipFile + ac.red.bold(` ${funcName} does not exist`))
-            return -1;
-        }
-    }
-
-    try {fs.writeFileSync(deploymentRecordPath, JSON.stringify(deploymentRecord)) } catch {}
-
-    return 0;
+  return 0
 }
 
-//------------
-
-export async function deployPackage(funcName:string, zipFile?:string) {
-    // first off, anchor a base directory
-    zipFile ??= path.join(projectPaths.basePath, 'MistLift_Zips', funcName+".zip")
-
-    // funcname gets decorated with current instance identifier
-    var idsrc = md5((getProjectName()??"") + (getProjectVersion()??""))
-    var dFuncName = funcName + "_"+idsrc
-
-    // See if function exists
-    const client:any = new LambdaClient(getAWSCredentials());
-    const command:any = new DeleteFunctionCommand({
-        FunctionName: dFuncName
-    });
-    client.send(command).then((response:any) => {
-    }).catch((e:any) =>  {
-    });
-
-    // console.log(ac.green.italic("deploying ")+ac.green.bold(funcName)+"...")
-
-    try {
-        const response:any = await CreateCloudFunction(dFuncName, zipFile);
-        const parts = response.FunctionArn.split(":");
-        const principal = parts[4]
-        await AddPermissions(client, dFuncName, principal);
-        console.log(ac.green.bold(`Successfully deployed ${funcName}`));
-    }
-    catch(e:any) {
-        console.error(ac.red.bold.italic("Error deploying "+funcName), e);
-    }
+// ------------
+
+export async function deployPackage (
+  funcName: string,
+  zipFile?: string
+): Promise<void> {
+  // first off, anchor a base directory
+  zipFile ??= path.join(projectPaths.basePath, 'MistLift_Zips', funcName + '.zip')
+
+  // funcname gets decorated with current instance identifier
+  const idsrc = md5((getProjectName() ?? '') + (getProjectVersion()?.toString() ?? ''))
+  const dFuncName = funcName + '_' + idsrc
+
+  // See if function exists
+  const client: any = new LambdaClient(getAWSCredentials())
+  const command: any = new DeleteFunctionCommand({
+    FunctionName: dFuncName
+  })
+  client.send(command).then((response: any) => {
+  }).catch((e: any) => {
+  })
+
+  // console.log(ac.green.italic("deploying ")+ac.green.bold(funcName)+"...")
+
+  try {
+    const response: any = await CreateCloudFunction(dFuncName, zipFile)
+    const parts = response.FunctionArn.split(':')
+    const principal = parts[4]
+    await AddPermissions(client, dFuncName, principal)
+    console.log(ac.green.bold(`Successfully deployed ${funcName}`))
+  } catch (e: any) {
+    console.error(ac.red.bold.italic('Error deploying ' + funcName), e)
+  }
 }
-async function CreateCloudFunction(
-    funcName:string,
-    zipFile:string
-
-) : Promise<any>
-{
-
-    const settings = getSettings();
-    const nodeRuntime:RuntimeType|undefined = settings.awsNodeRuntime
-    const serviceRole:string = settings.awsServiceRoleARN ?? ""
-    const zipFileBase64:Uint8Array = fs.readFileSync(zipFile);
-    const client:any = new LambdaClient(getAWSCredentials());
-    const command:any = new CreateFunctionCommand({
-        FunctionName: funcName,
-        Runtime: nodeRuntime,
-        Role: serviceRole,
-        Handler: 'runmain.handler',
-        Code: {
-            ZipFile: zipFileBase64
-        }
-    });
-    return await client.send(command); // response
+async function CreateCloudFunction (
+  funcName: string,
+  zipFile: string
+
+): Promise<any> {
+  const settings = getSettings()
+  const nodeRuntime: RuntimeType | undefined = settings.awsNodeRuntime
+  const serviceRole: string = settings.awsServiceRoleARN ?? ''
+  const zipFileBase64: Uint8Array = fs.readFileSync(zipFile)
+  const client: any = new LambdaClient(getAWSCredentials())
+  const command: any = new CreateFunctionCommand({
+    FunctionName: funcName,
+    Runtime: nodeRuntime,
+    Role: serviceRole,
+    Handler: 'runmain.handler',
+    Code: {
+      ZipFile: zipFileBase64
+    }
+  })
+  const resp = await client.send(command) // response
+  return resp
 }
 
-function AddPermissions(client:LambdaClient, funcName:string, principal:string):Promise<any>
-{
-    const region = getSettings().awsPreferredRegion
-    const WSApi = "/"+funcName.toLowerCase();
-    const command:any = new AddPermissionCommand({
-        FunctionName: funcName,
-        StatementId: "InvokePermission",
-        Action: "lambda:invokeFunction",
-        Principal: "apigateway.amazonaws.com",
-        SourceArn: `arn:aws:execute-api:${region}:${principal}:${WSApi}`
-    });
-    return client.send(command);
+async function AddPermissions (
+  client: LambdaClient,
+  funcName: string,
+  principal: string
+): Promise<any> {
+  const region = getSettings().awsPreferredRegion ?? ''
+  const WSApi = '/' + funcName.toLowerCase()
+  const command: any = new AddPermissionCommand({
+    FunctionName: funcName,
+    StatementId: 'InvokePermission',
+    Action: 'lambda:invokeFunction',
+    Principal: 'apigateway.amazonaws.com',
+    SourceArn: `arn:aws:execute-api:${region}:${principal}:${WSApi}`
+  })
+  const resp = await client.send(command)
+  return resp
 }

package/src/commands/doctor.ts

@@ -1,102 +1,106 @@
 
-import * as ac from "ansi-colors"
-import {VersionInfo, getLiftVersion, getProjectVersion, getProjectName} from "../lib/LiftVersion";
-import {executeCommand} from "../lib/executeCommand"
-import {resolvePaths} from "../lib/pathResolve";
-import {areSettingsAvailable} from "../lib/LiftConfig";
+import * as ac from 'ansi-colors'
+import { VersionInfo, getLiftVersion, getProjectVersion, getProjectName } from '../lib/LiftVersion'
+import { executeCommand } from '../lib/executeCommand'
+import { resolvePaths } from '../lib/pathResolve'
+import { areSettingsAvailable } from '../lib/LiftConfig'
 
-export async function doDoctor():Promise<boolean>
-{
-    console.log(ac.blue.bold('Lift doctor'));
+export async function doDoctor (): Promise<boolean> {
+  console.log(ac.blue.bold('Lift doctor'))
 
-    const liftVersion = getLiftVersion().toString()
-    const projectVersion = getProjectVersion().toString()
-    const projectName = getProjectName();
-    const typescriptVersion = await fetchTypescriptVersion()
-    const nodeVersion = await fetchNodeVersion()
-    const npmVersion = await fetchNpmVersion()
-    const gitVersion = await fetchGitVersion();
-    const settingsAvail = areSettingsAvailable();
+  const liftVersion = getLiftVersion()?.toString() ?? ''
+  const projectVersion = getProjectVersion()?.toString() ?? ''
+  const projectName = getProjectName() ?? ''
+  const typescriptVersion = await fetchTypescriptVersion() ?? ''
+  const nodeVersion = await fetchNodeVersion() ?? ''
+  const npmVersion = await fetchNpmVersion() ?? ''
+  const gitVersion = await fetchGitVersion() ?? ''
+  const settingsAvail = areSettingsAvailable()
 
-    console.log("Checking installed dependencies:")
-    let ok = report("MistLift", liftVersion, "0.1.0")
-    ok = ok && report("Typescript", typescriptVersion, "5.3.3")
-    ok = ok && report("Node", nodeVersion, "20.11.0")
-    ok = ok && report("Npm", npmVersion, "10.3.0")
-    report("Git", gitVersion, "2.0.0")
-    if(!settingsAvail) {
-        console.log("")
-        console.log(ac.yellow.dim.bold("Cloud Settings are not set. ")+ac.blue("run "+ac.bold("lift settings")))
+  console.log('Checking installed dependencies:')
+  let ok = report('MistLift', liftVersion, '0.1.0')
+  ok = ok && report('Typescript', typescriptVersion, '5.3.3')
+  ok = ok && report('Node', nodeVersion, '20.11.0')
+  ok = ok && report('Npm', npmVersion, '10.3.0')
+  report('Git', gitVersion, '2.0.0')
+  if (!settingsAvail) {
+    console.log('')
+    console.log(ac.yellow.dim.bold('Cloud Settings are not set. ') + ac.blue('run ' + ac.bold('lift settings')))
+  }
+  if (!ok) {
+    console.log('')
+    console.log(ac.red.bold('System needs updates before MistLift can be used.'))
+  } else {
+    console.log('')
+    console.log(ac.green.bold('Ready for MistLift'))
+    console.log('')
+    if (resolvePaths().verified) {
+      console.log(ac.blue.italic('Current project ' + projectName + ' ' + projectVersion))
     }
-    if(!ok) {
-        console.log("")
-        console.log(ac.red.bold("System needs updates before MistLift can be used."));
-    } else {
-        console.log("")
-        console.log(ac.green.bold("Ready for MistLift"))
-        console.log("");
-        if(resolvePaths().verified) {
-            console.log(ac.blue.italic("Current project " + projectName + " " + projectVersion))
-        }
-    }
-    return ok
+  }
+  return ok
 }
 
-function versionTrim(vstr:string)
-{
-    vstr = vstr.trim();
-    let i = -1;
-    while(++i < vstr.length) {
-        let c = vstr.charAt(i);
-        if(c >= '0' && c <= '9') break;
-    }
-    return vstr.substring(i);
+function versionTrim (vstr: string): string {
+  vstr = vstr.trim()
+  let i = -1
+  while (++i < vstr.length) {
+    const c = vstr.charAt(i)
+    if (c >= '0' && c <= '9') break
+  }
+  return vstr.substring(i)
 }
 
-async function fetchTypescriptVersion()
-{
-    const result = await executeCommand('tsc', ['-v'])
-    if(result.retcode) return "Typescript not found"
-    var vstr = versionTrim(result.stdStr);
-    return vstr;
+async function fetchTypescriptVersion (
+
+): Promise<string> {
+  const result = await executeCommand('tsc', ['-v'])
+  if (result.retcode !== 0) return 'Typescript not found'
+  const vstr = versionTrim(result.stdStr)
+  return vstr
 }
 
-async function fetchNodeVersion()
-{
-    const result = await executeCommand('node', ['-v'])
-    if(result.retcode) return "Node not found"
-    var vstr = versionTrim(result.stdStr);
-    return vstr;
+async function fetchNodeVersion (
 
+): Promise<string> {
+  const result = await executeCommand('node', ['-v'])
+  if (result.retcode !== 0) return 'Node not found'
+  const vstr = versionTrim(result.stdStr)
+  return vstr
 }
 
-async function fetchNpmVersion()
-{
-    const result = await executeCommand('npm', ['-v'])
-    if(result.retcode) return "npm not found"
-    var vstr = versionTrim(result.stdStr);
-    return vstr;
+async function fetchNpmVersion (
+
+): Promise<string> {
+  const result = await executeCommand('npm', ['-v'])
+  if (result.retcode !== 0) return 'npm not found'
+  const vstr = versionTrim(result.stdStr)
+  return vstr
 }
 
-async function fetchGitVersion()
-{
-    const result = await executeCommand('git', ['-v'])
-    if(result.retcode) return "Git not found"
-    var vstr = versionTrim(result.stdStr);
-    return vstr;
+async function fetchGitVersion (
+
+): Promise<string> {
+  const result = await executeCommand('git', ['-v'])
+  if (result.retcode !== 0) return 'Git not found'
+  const vstr = versionTrim(result.stdStr)
+  return vstr
 }
 
 // compare to a minimum and report ok or error
 
-function report(name:string, version:string, minStr:string):boolean
-{
-    const ver = new VersionInfo(version);
-    const minVer = new VersionInfo(minStr);
-    let ok = (ver.isGreaterThan(minVer) || ver.equals(minVer))
-    if(ok) {
-        console.log(ac.green.bold("√ ")+ac.black.bold(name)+" "+ac.grey(version))
-    } else {
-        console.log(ac.red.bold("X ")+ac.black.bold(name)+ac.red.bold(" does not meet minimum version of ")+ac.blue(minStr))
-    }
-    return ok;
-}
+function report (
+  name: string,
+  version: string,
+  minStr: string
+): boolean {
+  const ver = new VersionInfo(version)
+  const minVer = new VersionInfo(minStr)
+  const ok = (ver.isGreaterThan(minVer) || ver.equals(minVer))
+  if (ok) {
+    console.log(ac.green.bold('√ ') + ac.black.bold(name) + ' ' + ac.grey(version))
+  } else {
+    console.log(ac.red.bold('X ') + ac.black.bold(name) + ac.red.bold(' does not meet minimum version of ') + ac.blue(minStr))
+  }
+  return ok
+}