vercel-deno-dev - npm Package Compare versions

Comparing version 0.1.0-50879fc6208f4e577b48523d479eee1641bce3f7 to 0.1.0-5238fa86ec2084315168ee3132e2a4654190e906

dist/boot/runtime.ts

@@ -52,2 +52,5 @@ import * as base64 from 'https://deno.land/x/base64/mod.ts';
             const output = new Deno.Buffer();
+                  output.grow(33554432); // Initialize memory size to 2^25 ~~ 33.5 MB
+                                         // Default buffer size: 4096 Bytes.
+
             const req:NowRequest = new ServerRequest();
@@ -59,5 +62,5 @@ req.r = new BufReader(input);
             req.url = data.path;
-            req.proto = 'HTTP/1.1';
-            req.protoMinor = 1;
-            req.protoMajor = 1;
+            req.proto = 'HTTP/2.0';
+            req.protoMinor = 0;
+            req.protoMajor = 2;
 
@@ -89,11 +92,10 @@ for (const [name, value] of Object.entries(data.headers)) {
             
-            // The actual output is raw HTTP message,
-            // so we will parse it
-            // - Headers ( statuscode default to 200 )
-            // - Message
-
-            const bufr = new BufReader(output);
+            // TODO: dynamically determine buffer size.
+            // output.length has a mismatch size of a few hundret bytes compared to boy.bytlength.
+            // not including size argument will make bufReader use default size 4096 Bytes.
+            // console.log({outlen:output.length})
+            const bufr = new BufReader(output,output.length);
             const tp = new TextProtoReader(bufr);
             
-            const firstLine = await tp.readLine() || 'HTTP/1.1 200 OK'; // e.g. "HTTP/1.1 200 OK"
+            const firstLine = await tp.readLine() || 'HTTP/2.0 200 OK'; // e.g. "HTTP/1.1 200 OK"
             const statuscode = res ? res.status || 200 : parseInt(firstLine.split(' ', 2)[1], 10); // get statuscode either from res or req.
@@ -106,9 +108,14 @@ const headers = await tp.readMIMEHeader() || new Headers();
 
-            const body = await bufr.readFull(new Uint8Array(bufr.buffered()));
+            let buff = new Uint8Array(bufr.size());
+            const size = await bufr.read(buff)||bufr.size();
+            const body = buff.slice(0,size);
             if (!body) throw new Deno.errors.UnexpectedEof();
-
+            // console.log({
+            //     outlen:output.length,
+            //     bodylen:body.byteLength,
+            // })
             await req.finalize();
 
             result = {
-                statuscode: statuscode,
+                statusCode: statuscode,
                 headers: headersObj,
@@ -128,3 +135,3 @@ encoding: 'base64',
     console.log("invoke Response")
-    console.log({result,context})
+    console.log({result})
     const res = await LambdaFetch(`invocation/${context.awsRequestId}/response`, {
@@ -131,0 +138,0 @@ method: 'POST',

dist/build/index.js

@@ -8,5 +8,3 @@ "use strict";
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
 const util_1 = require("./util");
-const getDenoFiles_1 = __importDefault(require("./getDenoFiles"));
 async function build(opts) {
@@ -16,8 +14,8 @@ const { files, entrypoint, workPath, meta = {} } = opts;
     console.log("downloading source files");
-    const downloadedFiles = await build_utils_1.download(files, path_1.default.join(workPath, "src"), meta);
+    const downloadedFiles = await build_utils_1.download(files, workPath, meta);
     // 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 });
+    const denoFiles = await util_1.getdenoFiles(workPath, meta.isDev || false);
+    const bootFiles = await util_1.getbootFiles(workPath);
+    const cacheFiles = await util_1.CacheEntryPoint(opts, downloadedFiles, denoFiles, bootFiles);
+    // console.log({downloadedFiles, denoFiles,bootFiles,genFiles})
     // Files directory:
@@ -27,4 +25,4 @@ // - .deno
     //    - /gen
-    //    - /bin/deno 
-    // - src
+    //    - /bin/deno
+    //    - *.d.ts 
     // - bootstrap
@@ -37,5 +35,5 @@ // - runtime.ts
             ...downloadedFiles,
-            ...denoFiles,
+            ...cacheFiles,
             ...bootFiles,
-            ...genFiles,
+            ...denoFiles
         },
@@ -42,0 +40,0 @@ environment: {

dist/build/util.js

@@ -6,8 +6,7 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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"));
+exports.CacheEntryPoint = exports.getbootFiles = exports.getdenoFiles = exports.parseDenoVersion = void 0;
 const dist_1 = require("@vercel/build-utils/dist");
-exports.DENO_LATEST = "latest";
-exports.DENO_VERSION = process.env.DENO_VERSION || exports.DENO_LATEST;
+const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
+const execa_1 = __importDefault(require("execa"));
 function parseDenoVersion(version) {
@@ -25,11 +24,73 @@ if (version === "latest")
 exports.parseDenoVersion = parseDenoVersion;
+async function getdenoFiles(workPath, isDev) {
+    console.log("get deno binary files");
+    const DENO_LATEST = "latest";
+    const DENO_VERSION = process.env.DENO_VERSION || DENO_LATEST;
+    const DOWNLOAD_URL = DENO_VERSION === DENO_LATEST
+        ? `https://github.com/denoland/deno/releases/latest/download/deno-x86_64-unknown-linux-gnu.zip`
+        : `https://github.com/denoland/deno/releases/download/v${DENO_VERSION}/deno-x86_64-unknown-linux-gnu.zip`;
+    const denobinDir = path_1.join(workPath, '.deno/bin/');
+    const denozipPath = path_1.join(denobinDir, 'deno.zip');
+    let denoPath = '';
+    // check if local deno binary exists
+    if (isDev) {
+        try {
+            const checklocalDeno = await execa_1.default('which', ['deno'], { stderr: 'ignore' });
+            denoPath = checklocalDeno.stdout;
+        }
+        catch (e) { }
+        ;
+    }
+    if (!denoPath) {
+        try {
+            console.log(`downloading deno ${DENO_VERSION}`);
+            await execa_1.default("curl", ['--location', '--create-dirs', '--output', denozipPath, DOWNLOAD_URL], { stdio: 'pipe' });
+            console.log(`Extract deno.zip`);
+            await execa_1.default("unzip", [denozipPath, '-d', denobinDir], { stdio: 'pipe' });
+            // const {stdout} = await execa(`ls`,[ join(workPath,'.deno/bin/')],{ stdio: 'pipe' });
+            // console.log(stdout);
+            // await execa('chmod',['+x',denoPath]);
+            console.log(`remove deno.zip`);
+            await execa_1.default("rm", [denozipPath], { stdio: 'pipe' });
+            denoPath = path_1.join(denobinDir, 'deno');
+        }
+        catch (err) {
+            console.log(err);
+            throw new Error(err);
+        }
+    }
+    else
+        console.log('using local deno binary');
+    return {
+        ".deno/bin/deno": new dist_1.FileFsRef({
+            mode: 0o755,
+            fsPath: denoPath,
+        })
+    };
+}
+exports.getdenoFiles = getdenoFiles;
+async function getbootFiles(workPath) {
+    console.log('get bootstrap');
+    const bootstrapPath = path_1.join(__dirname, "../boot/bootstrap");
+    const runtimeGlobs = await dist_1.glob("boot/*.ts", { cwd: path_1.join(__dirname, "../") });
+    const runtimeFiles = await dist_1.download(runtimeGlobs, workPath);
+    return {
+        ...runtimeFiles,
+        bootstrap: new dist_1.FileFsRef({
+            mode: 0o755,
+            fsPath: bootstrapPath,
+        })
+    };
+}
+exports.getbootFiles = getbootFiles;
 /**
  * returns .deno files
  */
-async function getgenFiles(opts, downloadedFiles, bootFiles, denoFiles) {
+async function CacheEntryPoint(opts, downloadedFiles, denoFiles, bootFiles) {
     console.log(`Caching imports for ${opts.entrypoint}`);
-    console.log({ downloadedFiles, bootFiles, denoFiles });
+    // TODO: create separate function to parse user ENV values
+    const tsconfig = process.env.DENO_CONFIG ? [`-c`, `${downloadedFiles[process.env.DENO_CONFIG].fsPath}`] : [];
     const { workPath, entrypoint } = opts;
+    const denobinPath = '.deno/bin/deno';
     const runtimePath = 'boot/runtime.ts';
-    const denobinPath = '.deno/bin/deno';
     const denobin = denoFiles[denobinPath].fsPath;
@@ -39,24 +100,47 @@ const runtime = bootFiles[runtimePath].fsPath;
     if (denobin && runtime) {
-        child_process_1.spawn(denobin, ['cache', entry, runtime], {
-            env: { DENO_DIR: path_1.default.join(workPath, '.deno/') },
-            stdio: 'inherit',
+        await execa_1.default(denobin, ['cache', ...tsconfig, runtime, entry], {
+            env: { DENO_DIR: path_1.join(workPath, '.deno/') },
+            stdio: 'ignore',
         });
     }
-    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);
+    // patch .graph files to use file paths beginning with /var/task
+    // reference : https://github.com/TooTallNate/vercel-deno/blob/5a236aab30eeb4a6e68216a80f637e687bc59d2b/src/index.ts#L98-L118
+    const workPathUri = `file://${workPath}`;
+    for await (const file of getGraphFiles(path_1.join(workPath, '.deno/gen/file'))) {
+        let needsWrite = false;
+        const graph = JSON.parse(await fs_extra_1.readFile(file, 'utf8'));
+        for (let i = 0; i < graph.deps.length; i++) {
+            const dep = graph.deps[i];
+            if (dep.startsWith(workPathUri)) {
+                const updated = `file:///var/task/${dep.substring(workPathUri.length)}`;
+                graph.deps[i] = updated;
+                needsWrite = true;
+            }
+        }
+        if (needsWrite) {
+            console.log('Patched %j', file);
+            await fs_extra_1.writeFile(file, JSON.stringify(graph));
+        }
+    }
+    // move generated files to AWS path /var/task
+    const cwd = path_1.join(workPath, '.deno', 'gen', 'file', workPath);
+    const aws_task = path_1.join(workPath, '.deno', 'gen', 'file', 'var', 'task');
+    await fs_extra_1.move(cwd, aws_task, { overwrite: true });
+    return await dist_1.glob(".deno/**", workPath);
 }
-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.CacheEntryPoint = CacheEntryPoint;
+async function* getGraphFiles(dir) {
+    const files = await fs_extra_1.readdir(dir);
+    for (const file of files) {
+        const absolutePath = path_1.join(dir, file);
+        if (file.endsWith('.graph')) {
+            yield absolutePath;
+        }
+        else {
+            const s = await fs_extra_1.stat(absolutePath);
+            if (s.isDirectory()) {
+                yield* getGraphFiles(absolutePath);
+            }
+        }
+    }
 }
-exports.getbootFiles = getbootFiles;

dist/prepareCache.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//import { spawn } from 'child_process';
+/// unused. 
 function prepareCache({ files, entrypoint }) {
@@ -13,11 +13,3 @@ console.log("Execute caching for 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-50879fc6208f4e577b48523d479eee1641bce3f7",
+  "version": "0.1.0-5238fa86ec2084315168ee3132e2a4654190e906",
   "description": "run deno on vercel",
@@ -9,6 +9,4 @@ "main": "./dist/index",
   "dependencies": {
-    "@vercel/build-utils": "^2.3.1",
-    "fs-extra": "^9.0.1",
-    "which": "^2.0.2",
-    "execa": "4.0.2"
+    "execa": "4.0.2",
+    "fs-extra": "^9.0.1"
   },
@@ -20,5 +18,5 @@ "files": [
   "devDependencies": {
+    "@vercel/build-utils": "^2.3.1",
     "@types/fs-extra": "^9.0.1",
     "@types/node": "^14.0.1",
-    "@types/which": "^1.3.2",
     "@vercel/frameworks": "^0.0.14",
@@ -29,5 +27,7 @@ "@vercel/routing-utils": "^1.8.2",
   "scripts": {
-    "build": "tsc && cp -R ./src/boot/ ./dist/boot/",
-    "test": "rmdir /s /q .\\test\\dist_ress\\ || tsc --project ./test/tsconfig.json && node ./test/dist_ress/test.js"
+    "clean": "if exist .\\dist\\ ( rmdir /s/q .\\dist\\ )",
+    "build:win": "tsc && (robocopy .\\src\\boot .\\dist\\boot\\ * /s) ^& IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0",
+    "build": "tsc && cp -R ./src/boot/. ./dist/boot/",
+    "publish:win": "npm run clean && npm run build:win"
   }
 }

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

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

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

Improved metrics

Total package byte prevSize

23029

increased by6.45%

Dependency count

2

decreased by-50%

Lines of code

511

increased by6.24%

Number of medium supply chain risk alerts

0

decreased by-100%

Worsened metrics

Number of lines in readme file

53

decreased by-25.35%

Number of low supply chain risk alerts

7

increased by40%

Dependency changes

• + Addedcross-spawn@7.0.6(transitive)

• - Removed@vercel/build-utils@^2.3.1

• - Removedwhich@^2.0.2

• - Removed@vercel/build-utils@2.17.0(transitive)

• - Removedcross-spawn@7.0.5(transitive)