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

package/src/expressRoutes/functionBinder.ts

@@ -1,169 +1,162 @@
-import path from "path";
-import fs from "fs";
-
-const clearModule = require('clear-module')
-
-import * as ac from "ansi-colors"
-import {resolvePaths} from "../lib/pathResolve";
-import {GetWebrootServePaths} from "../lib/openAPI/WebrootFileSupport"
-import {doBuildAsync} from "../commands/build"
+/* eslint @typescript-eslint/no-var-requires: "off" */
+import path from 'path'
 
+import * as ac from 'ansi-colors'
+import { resolvePaths } from '../lib/pathResolve'
 
 import express from 'express'
-import {gatherFunctionDefinitions} from "../lib/openAPI/ApiBuildCollector";
-import {buildOpenApi} from "../lib/openAPI/openApiConstruction";
-const router = express.Router();
-
-
-export function functionBinder() {
-    const defs = gatherFunctionDefinitions();
-    buildOpenApi(defs).then(() => { // creates apidoc.yaml for when /api is run
-
-
-        const projectPaths = resolvePaths();
+import { gatherFunctionDefinitions } from '../lib/openAPI/ApiBuildCollector'
+import { buildOpenApi } from '../lib/openAPI/openApiConstruction'
 
-        for (let def of defs) {
-            const {name, pathMap, allowedMethods} = def;
-            const methods = allowedMethods.split(',');
-            for (let method of methods) {
-                method = method.trim().toLowerCase();
-                let rpath = path.join(projectPaths.buildPath, 'functions', name, 'src', 'main.js')
-                clearModule(rpath);
-                const {start} = require(rpath);
-
-                let entryRoot = pathMap;
-                let n = entryRoot.indexOf("/{");
-                if (n !== -1) entryRoot = entryRoot.substring(0, n) + "/*";
-
-                const callNoBody = (pathMap: string, req: any, res: any) => {
-                    const event = requestToEvent(pathMap, req)
-                    Promise.resolve(start(event, null, null)).then(respOut => {
-                        handleResponse(res, respOut);
-                    })
-                }
-                const callWithBody = (pathMap: string, req: any, res: any) => {
-                    const event = requestToEvent(pathMap, req)
-                    event.body = req.body
-                    Promise.resolve(start(event, null, null)).then(respOut => {
-                        handleResponse(res, respOut);
-                    })
-                }
-
-                if (method === 'get') {
-                    router.get(entryRoot, (req, res) => callNoBody(pathMap, req, res))
-                } else if (method === 'post') {
-                    router.get(entryRoot, (req, res) => callWithBody(pathMap, req, res))
-                } else if (method === 'put') {
-                    router.put(entryRoot, (req, res) => callWithBody(pathMap, req, res))
-                } else if (method === 'patch') {
-                    router.patch(entryRoot, (req, res) => callWithBody(pathMap, req, res))
-                } else if (method === 'delete') {
-                    router.delete(entryRoot, (req, res) => callNoBody(pathMap, req, res))
-                } else {
-                    console.log(ac.red.bold("Cannot map method ") + ac.blue.bold(method))
-                }
+// import * as clearModule from 'clear-module'
+const clearModule = require('clear-module')
+const router = express.Router()
+
+export function functionBinder (): void {
+  const defs = gatherFunctionDefinitions()
+  buildOpenApi(defs).then(() => { // creates apidoc.yaml for when /api is run
+    const projectPaths = resolvePaths()
+
+    for (const def of defs) {
+      const { name, pathMap, allowedMethods } = def
+      const methods = allowedMethods.split(',')
+      for (let method of methods) {
+        method = method.trim().toLowerCase()
+        const rpath = path.join(projectPaths.buildPath, 'functions', name, 'src', 'main.js')
+        clearModule(rpath)
+        const { start } = require(rpath)
+
+        let entryRoot: string = pathMap
+        const n = entryRoot.indexOf('/{')
+        if (n !== -1) entryRoot = entryRoot.substring(0, n) + '/*'
+
+        const callNoBody = (pathMap: string, req: any, res: any): void => {
+          const event = requestToEvent(pathMap, req)
+          Promise.resolve(start(event, null, null)).then(respOut => {
+            handleResponse(res, respOut)
+          }).catch<any>((reason: any) => undefined)
+        }
+        const callWithBody = (pathMap: string, req: any, res: any): void => {
+          const event = requestToEvent(pathMap, req)
+          event.body = req.body
+          Promise.resolve(start(event, null, null)).then(respOut => {
+            handleResponse(res, respOut)
+          }).catch<any>((reason: any) => undefined)
+        }
 
-            }
+        if (method === 'get') {
+          router.get(entryRoot, (req, res) => callNoBody(pathMap, req, res))
+        } else if (method === 'post') {
+          router.get(entryRoot, (req, res) => callWithBody(pathMap, req, res))
+        } else if (method === 'put') {
+          router.put(entryRoot, (req, res) => callWithBody(pathMap, req, res))
+        } else if (method === 'patch') {
+          router.patch(entryRoot, (req, res) => callWithBody(pathMap, req, res))
+        } else if (method === 'delete') {
+          router.delete(entryRoot, (req, res) => callNoBody(pathMap, req, res))
+        } else {
+          console.log(ac.red.bold('Cannot map method ') + ac.blue.bold(method))
         }
-    })
+      }
+    }
+  }).catch<any>((reason: any) => undefined)
 }
 
-function requestToEvent(template:string, req:any) {
-    let path = req.originalUrl
-    const qi = path.indexOf('?');
-    if(qi !== -1) path = path.substring(0,qi);
-    let ptci = path.indexOf("://")+3;
-    let ei = path.indexOf("/", ptci);
-    let host = path.substring(0, ei);
-    if(ptci < 3) {
-        host = req.headers?.origin;
-        if(!host) {
-            host = req.headers?.referer ?? "";
-            let ptci = path.indexOf("://")+3;
-            let ei = path.indexOf("/", ptci);
-            host = ptci > 3 ? path.substring(0, ei) : "";
-        }
-        if(!host) {
-            // todo: http or https?
-            host = "http://"+req.headers?.host ?? "";
-        }
+function requestToEvent (template: string, req: any): any {
+  let path: string = req.originalUrl ?? ''
+  const qi = path.indexOf('?')
+  if (qi !== -1) path = path.substring(0, qi)
+  const ptci: number = path.indexOf('://') + 3
+  const ei: number = path.indexOf('/', ptci)
+  let host: string = path.substring(0, ei)
+  if (ptci < 3) {
+    host = req.headers?.origin ?? ''
+    if (host !== '') {
+      host = req.headers?.referer ?? ''
+      const ptci: number = path.indexOf('://') + 3
+      const ei: number = path.indexOf('/', ptci)
+      host = ptci > 3 ? path.substring(0, ei) : ''
     }
-    var cookies:any = {};
-    var cookieString = req.headers?.cookie ?? "";
-    var crumbs = cookieString.split(';')
-    for(let c of crumbs) {
-        const pair:string[] = c.split('=');
-        if(pair.length === 2) cookies[pair[0]] = pair[1]
+    if (host !== '') {
+      // todo: http or https?
+      host = `http://${(req.headers?.host as string | undefined) ?? ''}`
     }
-    const parameters:any = {}
-    const tslots = template.split('/');
-    const pslots = path.split('/');
-    for(let i = 0; i< tslots.length; i++) {
-        const brknm = (tslots[i]??"").trim();
-        if(brknm.charAt(0) === '{') {
-            const pn = brknm.substring(1, brknm.length - 1);
-            parameters[pn] = (pslots[i]??"").trim();
-        }
+  }
+  const cookies: any = {}
+  const cookieString = req.headers?.cookie ?? ''
+  const crumbs = cookieString.split(';')
+  for (const c of crumbs) {
+    const pair: string[] = c.split('=')
+    if (pair.length === 2) cookies[pair[0]] = pair[1]
+  }
+  const parameters: any = {}
+  const tslots = template.split('/')
+  const pslots = path.split('/')
+  for (let i = 0; i < tslots.length; i++) {
+    const brknm = (tslots[i] ?? '').trim()
+    if (brknm.charAt(0) === '{') {
+      const pn = brknm.substring(1, brknm.length - 1)
+      parameters[pn] = (pslots[i] ?? '').trim()
     }
-    for(let p of Object.getOwnPropertyNames(req.query)) {
-        parameters[p] = req.query[p]
+  }
+  for (const p of Object.getOwnPropertyNames(req.query)) {
+    parameters[p] = req.query[p]
+  }
+  const eventOut: any = {
+    requestContext: req,
+    request: {
+      originalUrl: host + (req.originalUrl as string),
+      headers: req.headers
+    },
+    cookies,
+    parameters
+  }
+  return eventOut
+}
+function handleResponse (res: any, resp: any): void {
+  // console.log(">>>>>>>> Handling response >>>>>>>>>")
+
+  if (resp !== undefined) {
+    if (resp.cookies !== undefined) {
+      // console.log("--- see cookies", resp.cookies)
+      let cookies: any = []
+      if (Array.isArray(resp.cookies)) {
+        cookies = resp.cookies
+      } else {
+        const age: number = resp.cookies.expireSeconds ?? 60 // 1 minute
+        delete resp.expireSeconds
+        Object.getOwnPropertyNames(resp.cookies).forEach(name => {
+          const value: string = resp.cookies[name]
+          cookies.push(`${name}=${value}; Max-Age=${age}; `)
+        })
+      }
+      // console.log("cookies being set", cookies)
+      res.setHeader('set-cookie', cookies)
+      delete resp.cookies
     }
-    const eventOut:any = {
-        requestContext: req,
-        request: {
-            originalUrl: host + req.originalUrl,
-            headers: req.headers
-        },
-        cookies,
-        parameters
+    if (resp.headers !== undefined) {
+      // if (resp.statusCode === 301) ClogTrace("Redirecting...");
+      for (const hdr of Object.getOwnPropertyNames(resp.headers)) {
+        // ClogTrace("Setting header ", hdr, resp.headers[hdr]);
+        res.setHeader(hdr, resp.headers[hdr])
+      }
+      delete resp.headers
+      // console.log("past setting headers");
+    }
+    if (resp.statusCode !== undefined) {
+      res.statusCode = resp.statusCode
+      delete resp.statusCode
     }
-    return eventOut;
-}
-function handleResponse(res:any, resp:any)
-{
-    // console.log(">>>>>>>> Handling response >>>>>>>>>")
-
-    if(resp) {
-        if (resp.cookies !== undefined) {
-            // console.log("--- see cookies", resp.cookies)
-            var cookies:any = []
-            if(Array.isArray(resp.cookies)) {
-                cookies = resp.cookies
-            } else {
-                var age = resp.cookies.expireSeconds ?? 60; // 1 minute
-                delete resp.expireSeconds;
-                Object.getOwnPropertyNames(resp.cookies).forEach(name => {
-                    var value = resp.cookies[name];
-                    cookies.push(`${name}=${value}; Max-Age=${age}; `);
-                })
-            }
-            // console.log("cookies being set", cookies)
-            res.setHeader("set-cookie", cookies);
-            delete resp.cookies;
-        }
-        if (resp.headers !== undefined) {
-            // if (resp.statusCode === 301) ClogTrace("Redirecting...");
-            for (var hdr of Object.getOwnPropertyNames(resp.headers)) {
-                // ClogTrace("Setting header ", hdr, resp.headers[hdr]);
-                res.setHeader(hdr, resp.headers[hdr])
-            }
-            delete resp.headers;
-            // console.log("past setting headers");
-        }
-        if (resp.statusCode !== undefined) {
-            res.statusCode = resp.statusCode;
-            delete resp.statusCode
-        }
 
-        if (resp.contentType !== undefined) {
-            res.setHeader("Content-Type", resp.contentType);
-            delete resp.contentType
-        }
-        if(resp.body) resp = resp.body;
+    if (resp.contentType !== undefined) {
+      res.setHeader('Content-Type', resp.contentType)
+      delete resp.contentType
     }
-    // console.log("headers to be sent", res.getHeaders())
-    // console.log("-- Sending response", resp)
-    res.send(resp);
+    if (resp.body !== undefined) resp = resp.body
+  }
+  // console.log("headers to be sent", res.getHeaders())
+  // console.log("-- Sending response", resp)
+  res.send(resp)
 }
 
 export default router

package/src/lib/CaseUtils.ts

@@ -1,68 +1,63 @@
 
 // separate a case-joined string into a string of space-separated words
-export function separated(
-    instr:string
-):string
-{
-    let outstr = '';
-    for(let i=0; i<instr.length; i++) {
-        let c = instr.charAt(i);
-        if(!isAlphaNum(c) || isUpperCase(c)) {
-            outstr += ' ';
-        }
-        outstr += c.toLowerCase();
+export function separated (
+  instr: string
+): string {
+  let outstr = ''
+  for (let i = 0; i < instr.length; i++) {
+    const c = instr.charAt(i)
+    if (!isAlphaNum(c) || isUpperCase(c)) {
+      outstr += ' '
     }
+    outstr += c.toLowerCase()
+  }
 
-    return outstr.trim()
+  return outstr.trim()
 }
 
-function isUpperCase(instr:string) {
-    return instr?.toUpperCase() === instr
+function isUpperCase (instr: string): boolean {
+  return instr?.toUpperCase() === instr
 }
-function isAlphaNum(char:string) {
-    let alnum = false
-    const cc = char.toUpperCase().charCodeAt(0)
-    if(cc >= 'A'.charCodeAt(0) && cc <= 'Z'.charCodeAt(0)) alnum = true
-    if(cc >= '0'.charCodeAt(0) && cc <= '9'.charCodeAt(0)) alnum = true
-    return alnum
+function isAlphaNum (char: string): boolean {
+  let alnum = false
+  const cc = char.toUpperCase().charCodeAt(0)
+  if (cc >= 'A'.charCodeAt(0) && cc <= 'Z'.charCodeAt(0)) alnum = true
+  if (cc >= '0'.charCodeAt(0) && cc <= '9'.charCodeAt(0)) alnum = true
+  return alnum
 }
 
-export function camelCase(
-    instr:string
-):string
-{
-    const seps = separated(instr).split(' ')
-    for(let i=1; i<seps.length; i++) {
-        seps[i] = seps[i].charAt(0).toUpperCase()+seps[i].substring(1)
-    }
-    return seps.join('')
+export function camelCase (
+  instr: string
+): string {
+  const seps = separated(instr).split(' ')
+  for (let i = 1; i < seps.length; i++) {
+    seps[i] = seps[i].charAt(0).toUpperCase() + seps[i].substring(1)
+  }
+  return seps.join('')
 }
 
-export function pascalCase(
-    instr:string
-):string
-{
-    const seps = separated(instr).split(' ')
-    for(let i=0; i<seps.length; i++) {
-        seps[i] = seps[i].charAt(0).toUpperCase()+seps[i].substring(1)
-    }
-    return seps.join('')
+export function pascalCase (
+  instr: string
+): string {
+  const seps = separated(instr).split(' ')
+  for (let i = 0; i < seps.length; i++) {
+    seps[i] = seps[i].charAt(0).toUpperCase() + seps[i].substring(1)
+  }
+  return seps.join('')
 }
 
-export function snakeCase(
-    instr:string
-):string
-{
-    return dashCase(instr, "_")
+export function snakeCase (
+  instr: string
+): string {
+  return dashCase(instr, '_')
+}
+export function dashCase (
+  instr: string,
+  dashChar: string = '-',
+  allCaps: boolean = false
+): string {
+  const seps = separated(instr).split(' ')
+  let out = seps.join(dashChar)
+  if (allCaps) out = out.toUpperCase()
+  return out
 }
-export function dashCase(
-    instr:string,
-    dashChar: string = '-',
-    allCaps: boolean = false
-):string
-{
-    const seps = separated(instr).split(' ')
-    let out = seps.join(dashChar)
-    if(allCaps) out = out.toUpperCase();
-    return out;
-}

package/src/lib/DirectoryUtils.ts

@@ -1,36 +1,34 @@
 
-import fs from 'fs';
-import {Stats} from 'fs'
+import fs, { Stats } from 'fs'
 import path from 'path'
 
 // Callback definition for recurseDirectory
-export interface RecurseCB {
-    (filepath: string, stats: Stats): boolean|void;
-}
+export type RecurseCB = (filepath: string, stats: Stats) => boolean
 
 // Recurse a directory, calling back to a 'for-each' callback for all files in tree
-export function recurseDirectory(dirpath:string, callback:RecurseCB) {
-    fs.readdirSync(dirpath).forEach((file:string) => {
-        const fpath = path.join(dirpath, file)
-        const stat = fs.lstatSync(fpath)
-        if(callback && !callback(fpath, stat)) {
-            if (stat.isDirectory()) {
-                recurseDirectory(fpath, callback)
-            }
-        }
-    })
+export function recurseDirectory (dirpath: string, callback?: RecurseCB): void {
+  fs.readdirSync(dirpath).forEach((file: string) => {
+    const fpath = path.join(dirpath, file)
+    const stat = fs.lstatSync(fpath)
+    if ((callback != null) && !callback(fpath, stat)) {
+      if (stat.isDirectory()) {
+        recurseDirectory(fpath, callback)
+      }
+    }
+  })
 }
 
 // find the latest mod time for matching files in this folder tree
-export function latestModification(dirpath:string, match:string) {
-    let latestTime = new Date(0);
-    if(fs.existsSync(dirpath)) {
-        recurseDirectory(dirpath, (filepath: string, stats: Stats) => {
-            let basefile = filepath.substring(filepath.lastIndexOf('/') + 1)
-            if (basefile.match(match)) {
-                if (stats.mtime > latestTime) latestTime = stats.mtime
-            }
-        })
-    }
-    return latestTime
-}
+export function latestModification (dirpath: string, match: string): Date {
+  let latestTime = new Date(0)
+  if (fs.existsSync(dirpath)) {
+    recurseDirectory(dirpath, (filepath: string, stats: Stats) => {
+      const basefile = filepath.substring(filepath.lastIndexOf('/') + 1)
+      if (basefile.match(match) != null) {
+        if (stats.mtime > latestTime) latestTime = stats.mtime
+      }
+      return false
+    })
+  }
+  return latestTime
+}

package/src/lib/LiftConfig.ts

@@ -1,58 +1,55 @@
 // configuration for setting cloud provider credentials
 // may expand later for other MistLift settings/preferences
 
-import path from "path";
-import fs from "fs";
-import AWS, {fromIni} from '@aws-sdk/credential-providers';
+import path from 'path'
+import fs from 'fs'
+import { fromIni } from '@aws-sdk/credential-providers'
 
-let s_liftConfigLoaded:LiftConfig|null = null;
+let sLiftConfigLoaded: LiftConfig | null = null
 
 // Defines the structure of the .mistlft json file
 // All relevant configuration for the cloud host goes here
 export class LiftConfig {
-    public cloudHost: string = "AWS" // all we support now
-    public awsIniProfile?: string
-    public awsPreferredRegion?:string
-    public awsNodeRuntime?: RuntimeType
-    public awsServiceRoleARN?:string
+  public cloudHost: string = 'AWS' // all we support now
+  public awsIniProfile?: string
+  public awsPreferredRegion?: string
+  public awsNodeRuntime?: RuntimeType
+  public awsServiceRoleARN?: string
 }
-export type RuntimeType = "nodejs" | "nodejs4.3" | "nodejs6.10" | "nodejs8.10" | "nodejs10.x" | "nodejs12.x" | "nodejs14.x" | "nodejs16.x" | "java8" | "java8.al2" | "java11" | "python2.7" | "python3.6" | "python3.7" | "python3.8" | "python3.9" | "dotnetcore1.0" | "dotnetcore2.0" | "dotnetcore2.1" | "dotnetcore3.1" | "dotnet6" | "dotnet8" | "nodejs4.3-edge" | "go1.x" | "ruby2.5" | "ruby2.7" | "provided" | "provided.al2" | "nodejs18.x" | "python3.10" | "java17" | "ruby3.2" | "ruby3.3" | "python3.11" | "nodejs20.x" | "provided.al2023" | "python3.12" | "java21";
+export type RuntimeType = 'nodejs' | 'nodejs4.3' | 'nodejs6.10' | 'nodejs8.10' | 'nodejs10.x' | 'nodejs12.x' | 'nodejs14.x' | 'nodejs16.x' | 'java8' | 'java8.al2' | 'java11' | 'python2.7' | 'python3.6' | 'python3.7' | 'python3.8' | 'python3.9' | 'dotnetcore1.0' | 'dotnetcore2.0' | 'dotnetcore2.1' | 'dotnetcore3.1' | 'dotnet6' | 'dotnet8' | 'nodejs4.3-edge' | 'go1.x' | 'ruby2.5' | 'ruby2.7' | 'provided' | 'provided.al2' | 'nodejs18.x' | 'python3.10' | 'java17' | 'ruby3.2' | 'ruby3.3' | 'python3.11' | 'nodejs20.x' | 'provided.al2023' | 'python3.12' | 'java21'
 
 // Available for general use because, why not?
-export function getUserHome() {
-    return process.env.HOME ?? process.env.HOMEPATH ?? process.env.USERPROFILE ?? "~";
+export function getUserHome (): string {
+  return process.env.HOME ?? process.env.HOMEPATH ?? process.env.USERPROFILE ?? '~'
 }
 
-export function LoadLiftConfig() : LiftConfig|null
-{
-    if(!s_liftConfigLoaded) {
-
-        const mistlift = path.join(getUserHome(), ".mistlift");
-        let configJson = "{}";
-        if (fs.existsSync(mistlift)) {
-            try {
-                configJson = fs.readFileSync(mistlift).toString();
-                s_liftConfigLoaded = JSON.parse(configJson);
-            } catch (e: any) {
-                //
-            }
-        }
+export function LoadLiftConfig (): LiftConfig | null {
+  if (sLiftConfigLoaded == null) {
+    const mistlift = path.join(getUserHome(), '.mistlift')
+    let configJson = '{}'
+    if (fs.existsSync(mistlift)) {
+      try {
+        configJson = fs.readFileSync(mistlift).toString()
+        sLiftConfigLoaded = JSON.parse(configJson)
+      } catch (e: any) {
+        //
+      }
     }
-    return s_liftConfigLoaded
+  }
+  return sLiftConfigLoaded
 }
-export function resetLiftConfig()
-{
-    s_liftConfigLoaded = null;
+export function resetLiftConfig (): void {
+  sLiftConfigLoaded = null
 }
 
-export function areSettingsAvailable():boolean {
-    const mistlift = path.join(getUserHome(), ".mistlift");
-    return fs.existsSync(mistlift);
+export function areSettingsAvailable (): boolean {
+  const mistlift = path.join(getUserHome(), '.mistlift')
+  return fs.existsSync(mistlift)
 }
 
-export function getSettings() : LiftConfig {
-    if (s_liftConfigLoaded == null) LoadLiftConfig();
-    return s_liftConfigLoaded as LiftConfig
+export function getSettings (): LiftConfig {
+  if (sLiftConfigLoaded == null) LoadLiftConfig()
+  return sLiftConfigLoaded as LiftConfig
 }
 
 /**
@@ -61,22 +58,17 @@ export function getSettings() : LiftConfig {
  * We will use the standard .aws config ini file, looked up by profile or default
  * Prior attempts to have it do more than this failed, and resulted in a default profile choice anyway.
  */
-export function getAWSCredentials() : any
-{
-    let config = LoadLiftConfig()
-    if(!config) {
-        // console.error("No .mistlift configuration found - using AWS default profile");
-        config = { cloudHost: "AWS", awsIniProfile: "default" }
-    }
-    if (config.cloudHost?.toUpperCase() !== "AWS")
-    {
-        throw Error("HostType Not Supported");
-    }
-    let credentials = {};
-    const profile = config.awsIniProfile ?? "default"
-    if(profile) {
-        credentials = fromIni({profile})
-    }
-
-    return credentials;
+export function getAWSCredentials (): any {
+  let config = LoadLiftConfig()
+  if (config == null) {
+    // console.error("No .mistlift configuration found - using AWS default profile");
+    config = { cloudHost: 'AWS', awsIniProfile: 'default' }
+  }
+  if (config.cloudHost?.toUpperCase() !== 'AWS') {
+    throw Error('HostType Not Supported')
+  }
+  let credentials = {}
+  const profile = config.awsIniProfile ?? 'default'
+  credentials = fromIni({ profile })
+  return credentials
 }