vercel-deno-dev - npm Package Compare versions

Comparing version 0.1.0-4d74fbd9a5f6e5dc1f59563e295a2af280298594 to 0.1.0-50879fc6208f4e577b48523d479eee1641bce3f7

dist/boot/runtime.ts

@@ -6,3 +6,3 @@ import * as base64 from 'https://deno.land/x/base64/mod.ts';
 import { Context, APIGatewayProxyEvent } from 'https://deno.land/x/lambda/mod.ts';
-import { NowApiHandler, NowRequest, NowResponse, NowRequestCookies, NowRequestQuery } from './NowHandler.ts';
+import { NowApiHandler, NowRequest, NowResponse, NowRequestCookies, NowRequestQuery } from './nowHandler.ts';
 
@@ -12,2 +12,3 @@ import { setLazyProp, getCookieParser, getQueryParser } from './helpers.ts';
 interface LambdaContext extends Context {
+    invokeid:any,
     callbackWaitsForEmptyEventLoop: any,
@@ -25,3 +26,4 @@ done: any,
 	AWS_LAMBDA_LOG_STREAM_NAME,
-	_HANDLER,
+    _HANDLER,
+    LAMBDA_TASK_ROOT,
 	AWS_LAMBDA_RUNTIME_API
@@ -32,45 +34,14 @@ } = Deno.env.toObject();
 const RUNTIME_PATH = '2018-06-01/runtime';
+const [HANDLER_FILE,HANDLER_NAME] = _HANDLER.split('.');
 
 async function initialize() {
-    // const prefix = Deno.env.get('DENO_PREFIX')
-    // let interpolate = prefix ? (params) => {
-    // const names = Object.keys(params);
-    // const vals = Object.values(params);
-    // return new Function(...names, `return \\\`\${prefix}\\\`;`)(...vals);
-    // } : (x) => { return '' };
-
-    // try {
-    // interpolate({ requestId: 'a', level: 'TEST' });
-    // } catch (e) {
-    // console.log('warn: DENO_PREFIX', e.message);
-    // interpolate = x => { return ''; };
-    // }
-
-    // const log = console.log;
-    // In order to support multiline cloudwatch logs we replace \n with \r.
-    // see https://github.com/hayd/deno-lambda/issues/40
-    // we also prefix log events with DENO_PREFIX
-
-    // const logger = (level) => {
-    // return (...args) => {
-    //     const prefix = interpolate({ requestId, level })
-    //     const text = Deno[Deno.internal].stringifyArgs(args);
-    //     log((prefix + text).replace(/\n/g, '\r'));
-    // }
-    // }
-    // console.log = logger('INFO');
-    // console.debug = logger('DEBUG');
-    // console.info = logger('INFO');
-    // console.warn = logger('WARN');
-    // console.error = logger('ERROR');
-
+    let handler: NowApiHandler | null = null;
     while (true) {
+        const { event, context } = await invocationNext();
         let result;
-        const { event, context } = await invocationNext();
-        let handler: NowApiHandler | null = null;
         try {
-
+            
             // import lambda function handler dynamically once.
             if (!handler) {
-                const module = await import(`./${_HANDLER}`);
+                const module = await import(`../${_HANDLER}`);
                 handler = module.default;
@@ -91,5 +62,5 @@ if (!handler) {
             req.url = data.path;
-            req.proto = 'HTTP/2.0';
-            req.protoMinor = 0;
-            req.protoMajor = 2;
+            req.proto = 'HTTP/1.1';
+            req.protoMinor = 1;
+            req.protoMajor = 1;
 
@@ -131,3 +102,2 @@ for (const [name, value] of Object.entries(data.headers)) {
             const statuscode = res ? res.status || 200 : parseInt(firstLine.split(' ', 2)[1], 10); // get statuscode either from res or req.
-            
             const headers = await tp.readMIMEHeader() || new Headers();
@@ -151,3 +121,3 @@ const headersObj: { [name: string]: string } = {};
         } catch(e) {
-            console.error(e);
+            console.log(e);
             continue;
@@ -160,2 +130,4 @@ }
 async function invocationResponse(result:any,context:LambdaContext) {
+    console.log("invoke Response")
+    console.log({result,context})
     const res = await LambdaFetch(`invocation/${context.awsRequestId}/response`, {
@@ -172,3 +144,3 @@ method: 'POST',
 		);
-	}
+    }
 }
@@ -183,10 +155,7 @@
 
-    const clientcontext:any = () => {
-        const context = headers.get('lambda-runtime-client-context');
-        return context ? JSON.parse(context) : undefined;
-    }
-    const identity:any = () => {
-        const cog_iden = headers.get('lambda-runtime-cognito-identity');
-        return cog_iden ? JSON.parse(cog_iden) : undefined;
-    }
+    const clientctx = headers.get('lambda-runtime-client-context');
+    const clientcontext =  clientctx ? JSON.parse(clientctx) : undefined;
+    
+    const cog_iden = headers.get('lambda-runtime-cognito-identity');
+    const identity =  cog_iden ? JSON.parse(cog_iden) : undefined;
 
@@ -203,2 +172,3 @@ Deno.env.set('_X_AMZN_TRACE_ID', headers.get('lambda-runtime-trace-id') || '');
         awsRequestId: requestId,
+        invokeid:requestId,
         identity:identity,
@@ -227,3 +197,3 @@ clientContext: clientcontext,
 		body
-	};
+    };
 }
@@ -247,3 +217,3 @@
             chunk = '';
-            } else if (Buffer.isBuffer(chunk)) {
+            } else if (chunk instanceof Uint8Array) {
                 if (!res.headers?.get('content-type')) {
@@ -303,12 +273,8 @@ res.headers?.set('content-type', 'application/octet-stream');
 
-
-// Startpoint.
-// Read the code flow from this section first.
 try {
     await initialize();
+} catch (err) {
+    console.error(err);
+    Deno.exit(1);
 }
-catch(e) {
-    console.error(e);
-	Deno.exit(1);
-}
   

dist/build/index.js

@@ -10,98 +10,38 @@ "use strict";
 const util_1 = require("./util");
-const gatherExtraFiles_1 = __importDefault(require("./gatherExtraFiles"));
-const runUserScripts_1 = __importDefault(require("./runUserScripts"));
-const grabDenoDirFiles_1 = __importDefault(require("./grabDenoDirFiles"));
-const getDenoLambdaLayer_1 = __importDefault(require("./getDenoLambdaLayer"));
-const version_1 = require("../version");
-const execa_1 = __importDefault(require("execa"));
+const getDenoFiles_1 = __importDefault(require("./getDenoFiles"));
 async function build(opts) {
-    const { files, entrypoint, workPath: wp, config, meta = {} } = opts;
-    const workPath = util_1.getWorkPath(wp, entrypoint);
+    const { files, entrypoint, workPath, meta = {} } = opts;
     await fs_extra_1.default.mkdirp(workPath);
-    // if (meta.isDev) {
-    //   debug('checking that deno is available');
-    //   ensureDeno();
-    //   debug('checking that bash is available');
-    //   ensureBash();
-    // }
-    const lambdaFiles = await getDenoLambdaLayer_1.default(workPath, meta.isDev || false);
-    // if (meta.isDev) {
-    //   debug('symlinking local deno to replace deno-lambda-layer bin/deno');
-    //   await replaceBinDeno(workPath);
-    // }
     console.log("downloading source files");
     const downloadedFiles = await build_utils_1.download(files, path_1.default.join(workPath, "src"), meta);
-    const entryPath = downloadedFiles[entrypoint].fsPath;
-    await runUserScripts_1.default(entryPath);
-    const extraFiles = await gatherExtraFiles_1.default(config.includeFiles, entryPath);
-    return buildDenoLambda(opts, downloadedFiles, extraFiles, lambdaFiles, workPath);
-}
-exports.default = build;
-async function buildDenoLambda({ entrypoint }, downloadedFiles, extraFiles, layerFiles, workPath) {
-    // Booleans
-    const unstable = !!process.env.DENO_UNSTABLE;
-    let tsconfig = "";
-    try {
-        const CONFIG = process.env.DENO_TSCONFIG || '';
-        if (CONFIG) {
-            tsconfig = downloadedFiles[CONFIG].fsPath || '';
-            console.log(`using custom typescript config: ${process.env.DENO_TSCONFIG}`);
-        }
-    }
-    catch (err) {
-        console.log(`DENO_TSCONFIG variable was set to ${process.env.DENO_TSCONFIG}, but no such file exists. ignoring...`);
-    }
-    console.log("building single file");
-    const entrypointPath = downloadedFiles[entrypoint].fsPath;
-    const entrypointDirname = path_1.default.dirname(entrypointPath);
-    const extname = path_1.default.extname(entrypointPath);
-    const binName = path_1.default.basename(entrypointPath).replace(extname, "");
-    const binPath = path_1.default.join(workPath, binName) + ".bundle.js";
-    const denoDir = path_1.default.join(workPath, "layer", ".deno_dir");
-    const denoVer = util_1.parseDenoVersion(process.env.DENO_VERSION || "latest");
-    console.log("running `deno bundle`...");
-    try {
-        const denoBin = layerFiles["bin/deno"].fsPath;
-        await execa_1.default(denoBin, [
-            "bundle",
-            entrypointPath,
-            binPath,
-            ...(tsconfig && (denoVer.major >= 1) ? ["-c", tsconfig] : []),
-            ...(unstable ? ["--unstable"] : []),
-        ], {
-            env: {
-                DENO_DIR: denoDir,
-            },
-            cwd: entrypointDirname,
-            stdio: "pipe",
-        });
-    }
-    catch (err) {
-        build_utils_1.debug("failed to `deno bundle`");
-        throw new Error("Failed to run `deno bundle`: " + err.stdout + " " + err.stderr);
-    }
-    const denoDirFiles = await grabDenoDirFiles_1.default(denoDir);
+    // configure environment variable
+    const denoFiles = await getDenoFiles_1.default(workPath);
+    const bootFiles = await util_1.getbootFiles();
+    const genFiles = await util_1.getgenFiles(opts, downloadedFiles, bootFiles, denoFiles);
+    console.log({ downloadedFiles, denoFiles, bootFiles, genFiles });
+    // Files directory:
+    // - .deno
+    //    - /deps
+    //    - /gen
+    //    - /bin/deno 
+    // - src
+    // - bootstrap
+    // - runtime.ts
+    // - nowHandler.ts
+    // - helpers.ts
     const lambda = await build_utils_1.createLambda({
         files: {
-            ...extraFiles,
-            ...layerFiles,
-            ...denoDirFiles,
-            [binName + ".bundle.js"]: new build_utils_1.FileFsRef({
-                mode: 0o755,
-                fsPath: binPath,
-            }),
+            ...downloadedFiles,
+            ...denoFiles,
+            ...bootFiles,
+            ...genFiles,
         },
-        handler: binName + ".handler",
-        runtime: "provided",
         environment: {
-            HANDLER_EXT: "bundle.js",
-            PATH: process.env.PATH + ":./bin",
+            DENO_CONFIG: process.env.DENO_CONFIG || ''
         },
+        handler: entrypoint,
+        runtime: "provided"
     });
-    if (version_1.version === 3) {
-        return { output: lambda };
-    }
-    return {
-        [entrypoint]: lambda,
-    };
+    return { output: lambda };
 }
+exports.default = build;

dist/build/util.js

@@ -6,26 +6,8 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkPath = exports.parseDenoVersion = exports.getDeno = exports.DENO_VERSION = exports.DENO_LATEST = void 0;
+exports.getbootFiles = exports.getgenFiles = exports.parseDenoVersion = exports.DENO_VERSION = exports.DENO_LATEST = void 0;
+const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
-const execa_1 = __importDefault(require("execa"));
+const dist_1 = require("@vercel/build-utils/dist");
 exports.DENO_LATEST = "latest";
 exports.DENO_VERSION = process.env.DENO_VERSION || exports.DENO_LATEST;
-async function getDeno(_config, meta) {
-    if (meta && meta.isDev) {
-        // Use the system-installed version of `deno` in PATH for `now dev`
-        const command = "deno --version";
-        let proc;
-        if (process.platform === "win32") {
-            proc = await execa_1.default("cmd.exe", ["/C", command], { stdio: 'pipe' });
-        }
-        else {
-            proc = await execa_1.default("sh", ["-c", command], { stdio: 'pipe' });
-        }
-        let deno = proc.stdout.split(/\n/)[0];
-        return parseDenoVersion(deno);
-    }
-    else {
-        return parseDenoVersion(exports.DENO_VERSION);
-    }
-}
-exports.getDeno = getDeno;
 function parseDenoVersion(version) {
@@ -43,2 +25,37 @@ if (version === "latest")
 exports.parseDenoVersion = parseDenoVersion;
-exports.getWorkPath = (workPath, entrypoint) => path_1.default.join(workPath, ".now", "builders", "now-denolis", entrypoint);
+/**
+ * returns .deno files
+ */
+async function getgenFiles(opts, downloadedFiles, bootFiles, denoFiles) {
+    console.log(`Caching imports for ${opts.entrypoint}`);
+    console.log({ downloadedFiles, bootFiles, denoFiles });
+    const { workPath, entrypoint } = opts;
+    const runtimePath = 'boot/runtime.ts';
+    const denobinPath = '.deno/bin/deno';
+    const denobin = denoFiles[denobinPath].fsPath;
+    const runtime = bootFiles[runtimePath].fsPath;
+    const entry = downloadedFiles[entrypoint].fsPath;
+    if (denobin && runtime) {
+        child_process_1.spawn(denobin, ['cache', entry, runtime], {
+            env: { DENO_DIR: path_1.default.join(workPath, '.deno/') },
+            stdio: 'inherit',
+        });
+    }
+    const cwd = path_1.default.join(workPath, '.deno', 'gen', 'file', workPath);
+    const aws_task = path_1.default.join(workPath, '.deno', 'gen', 'file', 'var', 'task');
+    return await dist_1.glob("**/*", { cwd: cwd }, aws_task);
+}
+exports.getgenFiles = getgenFiles;
+async function getbootFiles() {
+    console.log('get bootstrap');
+    const bootstrapPath = path_1.default.join(__dirname, "../boot/bootstrap");
+    let runtimefiles = await dist_1.glob("**/*.ts", { cwd: path_1.default.join(__dirname, '../boot') }, "boot");
+    return {
+        ...runtimefiles,
+        bootstrap: new dist_1.FileFsRef({
+            mode: 0o755,
+            fsPath: bootstrapPath,
+        })
+    };
+}
+exports.getbootFiles = getbootFiles;

dist/prepareCache.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-function prepareCache() {
+//import { spawn } from 'child_process';
+function prepareCache({ files, entrypoint }) {
+    console.log("Execute caching for deno");
+    const deno = files['.deno/bin/deno'].fsPath;
+    const entry = files[entrypoint].fsPath;
+    const env = {
+        ...process.env,
+        DENO_DIR: '/tmp/.deno',
+    };
+    console.log({ deno, entry, env });
+    // if (deno && entry) {
+    //     const ls = spawn(deno,['cache',entry],
+    //     {
+    //         env
+    //     })
+    // }
+    // execute caching
     // TODO: add cache here
 }
 exports.default = prepareCache;

package.json

 {
   "name": "vercel-deno-dev",
-  "version": "0.1.0-4d74fbd9a5f6e5dc1f59563e295a2af280298594",
+  "version": "0.1.0-50879fc6208f4e577b48523d479eee1641bce3f7",
   "description": "run deno on vercel",
@@ -5,0 +5,0 @@ "main": "./dist/index",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Shell access

Supply chain risk

This module accesses the system shell. Accessing the system shell increases the risk of executing arbitrary code.

Found 1 instance in 1 package

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 4 instances in 1 package

Improved metrics

Number of low supply chain risk alerts

5

decreased by-64.29%

Worsened metrics

Total package byte prevSize

21634

decreased by-32.79%

Number of package files

14

decreased by-22.22%

Lines of code

481

decreased by-24.25%

Number of medium supply chain risk alerts

1

increased byInfinity%

No dependency changes