Merge pull request #5 from lucacasonato/fix-deno-lambda-48

Fix deno lambda 48

Author: lucacasonato

README.md

@@ -13,17 +13,17 @@ If you're unfamiliar with now runtimes, please read the [runtime docs](https://z
 {
   "functions": {
     "api/**/*.ts": {
-      "runtime": "now-deno@0.1.0"
+      "runtime": "now-deno@0.2.0"
     }
   }
 }
 ```
 
 ```ts
 // api/hello.ts
-import { Context, Event } from 'https://deno.land/x/lambda/mod.ts';
+import { APIGatewayEventRequestContext, APIGatewayEvent } from 'https://deno.land/x/lambda/mod.ts';
 
-export async function handler(event: Event, context: Context) {
+export async function handler(event: APIGatewayEvent, context: APIGatewayEventRequestContext) {
   return {
     statusCode: 200,
     body: `Welcome to deno ${Deno.version.deno} 🦕`,

example/api/version.ts

@@ -1,11 +1,17 @@
-import { Context, Event,  } from "https://deno.land/x/lambda/mod.ts";
+import {
+  APIGatewayEventRequestContext,
+  APIGatewayEvent,
+} from 'https://deno.land/x/lambda/mod.ts';
 
-export async function handler(event: Event, context: Context) {
+export async function handler(
+  event: APIGatewayEvent,
+  context: APIGatewayEventRequestContext
+) {
   return {
     statusCode: 200,
     body: `Welcome to deno ${Deno.version.deno} 🦕`,
     headers: {
-      "Content-Type": "text/html; charset=utf-8"
-    }
+      'Content-Type': 'text/html; charset=utf-8',
+    },
   };
 }

example/now.json

@@ -1,8 +1,8 @@
 {
   "functions": {
     "api/**/*.ts": {
-      "runtime": "now-deno@0.1.0",
-      "memory":  128
+      "runtime": "now-deno@0.2.0",
+      "memory": 128
     }
   }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "now-deno",
   "description": "Community based builder for using deno on the now/zeit platform",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://github.com/lucacasonato/now-deno",

src/index.ts

@@ -50,30 +50,34 @@ async function buildDenoLambda(
   const extname = path.extname(entrypointPath);
   const binName = path.basename(entrypointPath).replace(extname, '');
   const binPath = path.join(workPath, binName) + '.bundle.js';
+  const denoDir = path.join(workPath, 'layer', '.deno_dir');
 
   const { debug } = config;
   console.log('running `deno bundle`...');
   try {
     await execa(
-      path.join(workPath, 'layer', 'amz-deno'),
+      path.join(workPath, 'layer', 'bin', 'deno'),
       ['bundle', entrypointPath, binPath].concat(debug ? ['-L debug'] : []),
       {
         env: {
-          DENO_DIR: path.join(workPath, 'layer', '.deno_dir'),
+          DENO_DIR: denoDir,
         },
         cwd: entrypointDirname,
         stdio: 'inherit',
       }
     );
   } catch (err) {
-    console.error('failed to `deno bundle`');
+    console.error('failed to `deno bundle`:' + err);
     throw err;
   }
 
+  const denoDirFiles = await getDenoDirFiles(denoDir);
+
   const lambda = await createLambda({
     files: {
       ...extraFiles,
       ...layerFiles,
+      ...denoDirFiles,
       [binName + '.bundle.js']: new FileFsRef({
         mode: 0o755,
         fsPath: binPath,
@@ -83,6 +87,7 @@ async function buildDenoLambda(
     runtime: 'provided',
     environment: {
       HANDLER_EXT: 'bundle.js',
+      PATH: process.env.PATH + ':./bin',
     },
   });
 
@@ -95,6 +100,34 @@ async function buildDenoLambda(
   };
 }
 
+async function walk(dir: string): Promise<string[]> {
+  const f = await fs.readdir(dir);
+  const files = await Promise.all(
+    f.map(async file => {
+      const filePath = path.join(dir, file);
+      const stats = await fs.stat(filePath);
+      if (stats.isDirectory()) return walk(filePath);
+      else if (stats.isFile()) return filePath;
+      throw 'File not dir or file: ' + filePath;
+    })
+  );
+
+  return files.flat();
+}
+
+async function getDenoDirFiles(denoDirPath: string): Promise<Files> {
+  const files: Files = {};
+
+  const dir = await walk(denoDirPath);
+
+  dir.forEach(file => {
+    const f = path.join('.deno_dir', file.replace(denoDirPath + '/', ''));
+    files[f] = new FileFsRef({ fsPath: file, mode: 0o755 });
+  });
+
+  return files;
+}
+
 async function getDenoLambdaLayer({ workPath }: BuildOptions): Promise<Files> {
   const zipPath = path.join(workPath, 'deno-lambda-layer.zip');
   try {
@@ -130,9 +163,9 @@ async function getDenoLambdaLayer({ workPath }: BuildOptions): Promise<Files> {
       mode: 0o755,
       fsPath: path.join(layerDir, 'bootstrap'),
     }),
-    'amz-deno': new FileFsRef({
+    'bin/deno': new FileFsRef({
       mode: 0o755,
-      fsPath: path.join(layerDir, 'amz-deno'),
+      fsPath: path.join(layerDir, 'bin/deno'),
     }),
   };
 }