@jsii/kernel 1.68.0 → 1.69.0

package/lib/kernel.js

@@ -4,14 +4,12 @@ exports.Kernel = exports.RuntimeError = exports.JsiiFault = void 0;
 const spec = require("@jsii/spec");
 const spec_1 = require("@jsii/spec");
 const cp = require("child_process");
-const fs_1 = require("fs");
 const fs = require("fs-extra");
 const module_1 = require("module");
 const os = require("os");
 const path = require("path");
 const api = require("./api");
 const api_1 = require("./api");
-const link_1 = require("./link");
 const objects_1 = require("./objects");
 const onExit = require("./on-exit");
 const wire = require("./serialization");
@@ -88,21 +86,13 @@ class Kernel {
         const originalUmask = process.umask(0o022);
         try {
             // untar the archive to its final location
-            const { path: extractedTo, cache } = this._debugTime(() => tar.extract(req.tarball, {
+            const { cache } = this._debugTime(() => tar.extract(req.tarball, packageDir, {
                 strict: true,
                 strip: 1,
                 unlink: true,
             }, req.name, req.version), `tar.extract(${req.tarball}) => ${packageDir}`);
-            // Create the install directory (there may be several path components for @scoped/packages)
-            fs.mkdirSync(path.dirname(packageDir), { recursive: true });
             if (cache != null) {
                 this._debug(`Package cache enabled, extraction resulted in a cache ${cache}`);
-                // Link the package into place.
-                this._debugTime(() => (0, link_1.link)(extractedTo, packageDir), `link(${extractedTo}, ${packageDir})`);
-            }
-            else {
-                // This is not from cache, so we move it around instead of copying.
-                (0, fs_1.renameSync)(extractedTo, packageDir);
             }
         }
         finally {

package/lib/tar-cache/index.d.ts

@@ -1,10 +1,6 @@
 import * as tar from 'tar';
 export declare type ExtractOptions = Omit<tar.ExtractOptions & tar.FileOptions, 'file' | 'cwd'>;
 export interface ExtractResult {
-    /**
-     * The path in which the extracted files are located
-     */
-    readonly path: string;
     /**
      * When `'hit'`, the data was already present in cache and was returned from
      * cache.
@@ -25,7 +21,7 @@ export interface ExtractResult {
  *
  * @returns the result of the extraction.
  */
-export declare function extract(file: string, options: ExtractOptions, ...comments: readonly string[]): ExtractResult;
+export declare function extract(file: string, outDir: string, options: ExtractOptions, ...comments: readonly string[]): ExtractResult;
 /** @internal */
 export declare function getPackageCacheEnabled(): boolean;
 /** @internal */

package/lib/tar-cache/index.js

@@ -3,10 +3,9 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setPackageCacheEnabled = exports.getPackageCacheEnabled = exports.extract = void 0;
 const fs_1 = require("fs");
-const os_1 = require("os");
-const path_1 = require("path");
 const tar = require("tar");
 const disk_cache_1 = require("../disk-cache");
+const link_1 = require("../link");
 const default_cache_root_1 = require("./default-cache-root");
 let packageCacheEnabled = ((_a = process.env.JSII_RUNTIME_PACKAGE_CACHE) === null || _a === void 0 ? void 0 : _a.toLocaleUpperCase()) === 'enabled';
 /**
@@ -18,27 +17,36 @@ let packageCacheEnabled = ((_a = process.env.JSII_RUNTIME_PACKAGE_CACHE) === nul
  *
  * @returns the result of the extraction.
  */
-function extract(file, options, ...comments) {
-    return (packageCacheEnabled ? extractToCache : extractToTemporary)(file, options, ...comments);
+function extract(file, outDir, options, ...comments) {
+    (0, fs_1.mkdirSync)(outDir, { recursive: true });
+    try {
+        return (packageCacheEnabled ? extractViaCache : extractToOutDir)(file, outDir, options, ...comments);
+    }
+    catch (err) {
+        (0, fs_1.rmSync)(outDir, { force: true, recursive: true });
+        throw err;
+    }
 }
 exports.extract = extract;
-function extractToCache(file, options = {}, ...comments) {
+function extractViaCache(file, outDir, options = {}, ...comments) {
     var _a;
     const cacheRoot = (_a = process.env.JSII_RUNTIME_PACKAGE_CACHE_ROOT) !== null && _a !== void 0 ? _a : (0, default_cache_root_1.defaultCacheRoot)();
-    const cache = disk_cache_1.DiskCache.inDirectory(cacheRoot);
-    const entry = cache.entryFor(file, ...comments);
-    return entry.lock((lock) => {
+    const dirCache = disk_cache_1.DiskCache.inDirectory(cacheRoot);
+    const entry = dirCache.entryFor(file, ...comments);
+    const { path, cache } = entry.lock((lock) => {
         let cache = 'hit';
         if (!entry.pathExists) {
-            const tmpPath = `${entry.path}.tmp`;
-            (0, fs_1.mkdirSync)(tmpPath, { recursive: true });
+            // !!!IMPORTANT!!!
+            // Extract directly into the final target directory, as certain antivirus
+            // software configurations on Windows will make a `renameSync` operation
+            // fail with EPERM until the files have been fully analyzed.
+            (0, fs_1.mkdirSync)(entry.path, { recursive: true });
             try {
                 untarInto({
                     ...options,
-                    cwd: tmpPath,
+                    cwd: entry.path,
                     file,
                 });
-                (0, fs_1.renameSync)(tmpPath, entry.path);
             }
             catch (error) {
                 (0, fs_1.rmSync)(entry.path, { force: true, recursive: true });
@@ -49,11 +57,16 @@ function extractToCache(file, options = {}, ...comments) {
         lock.touch();
         return { path: entry.path, cache };
     });
+    (0, link_1.link)(path, outDir);
+    return { cache };
 }
-function extractToTemporary(file, options = {}) {
-    const path = (0, fs_1.mkdtempSync)((0, path_1.join)((0, os_1.tmpdir)(), 'jsii-runtime-untar-'));
-    untarInto({ ...options, cwd: path, file });
-    return { path };
+function extractToOutDir(file, cwd, options = {}) {
+    // !!!IMPORTANT!!!
+    // Extract directly into the final target directory, as certain antivirus
+    // software configurations on Windows will make a `renameSync` operation
+    // fail with EPERM until the files have been fully analyzed.
+    untarInto({ ...options, cwd, file });
+    return {};
 }
 function untarInto(options) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsii/kernel",
-  "version": "1.68.0",
+  "version": "1.69.0",
   "description": "kernel for jsii execution environment",
   "license": "Apache-2.0",
   "author": {
@@ -31,19 +31,19 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/spec": "^1.68.0",
+    "@jsii/spec": "^1.69.0",
     "fs-extra": "^10.1.0",
     "lockfile": "^1.0.4",
     "tar": "^6.1.11"
   },
   "devDependencies": {
-    "@scope/jsii-calc-base": "^1.68.0",
-    "@scope/jsii-calc-lib": "^1.68.0",
+    "@scope/jsii-calc-base": "^1.69.0",
+    "@scope/jsii-calc-lib": "^1.69.0",
     "@types/fs-extra": "^9.0.13",
     "@types/lockfile": "^1.0.2",
     "@types/tar": "^6.1.2",
     "jest-expect-message": "^1.1.2",
-    "jsii-build-tools": "^1.68.0",
+    "jsii-build-tools": "^1.69.0",
     "jsii-calc": "^3.20.120"
   }
 }