@andersbakken/fisk 4.0.35 → 4.0.37

package/builder/VM_runtime.js

@@ -9,7 +9,7 @@ var require$$0$1 = require('stream');
 var require$$4 = require('util');
 var path$h = require('path');
 var require$$1$1 = require('os');
-var posix = require('posix');
+var fiskNative = require('@andersbakken/fisk-native');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -22,7 +22,6 @@ var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path$h);
 var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
-var posix__default = /*#__PURE__*/_interopDefaultLegacy(posix);
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -3595,7 +3594,7 @@ process.on("uncaughtException", (err) => {
 let pwd;
 if (argv.user) {
     try {
-        pwd = posix__default["default"].getpwnam(argv.user);
+        pwd = fiskNative.getpwnam(argv.user);
     }
     catch (err) {
         console.error("Couldn't find user", argv.user);
@@ -3610,7 +3609,7 @@ if (argv.user) {
 }
 try {
     console.log("Chrooting to", argv.root);
-    posix__default["default"].chroot(argv.root);
+    fiskNative.chroot(argv.root);
 }
 catch (err) {
     console.error("Changing root or user failed", err);

package/builder/fisk-builder.js

@@ -4322,7 +4322,7 @@ class ObjectCacheItem {
     }
     get contentsSize() {
         return this.response.index.reduce((total, item) => {
-            return total + item.bytes;
+            return total + item.uncompressedSize;
         }, 0);
     }
     get fileSize() {
@@ -7641,7 +7641,7 @@ class ObjectCache extends EventEmitter__default["default"] {
         }
         let remaining = 0;
         response.index.forEach((file) => {
-            remaining += file.bytes;
+            remaining += file.uncompressedSize;
         });
         const pendingItem = new ObjectCachePendingItem(response, absolutePath, remaining);
         pendingItem.file.on("error", (err) => {
@@ -7650,7 +7650,8 @@ class ObjectCache extends EventEmitter__default["default"] {
         });
         this.pending[response.sha1] = pendingItem;
         contents.forEach((c) => {
-            pendingItem.write(c.contents);
+            var _a;
+            pendingItem.write((_a = c.uncompressed) !== null && _a !== void 0 ? _a : c.contents);
         });
         pendingItem.end().then(() => {
             if (this.pending[response.sha1] === pendingItem) {
@@ -53990,54 +53991,38 @@ function requireFollowRedirects () {
 	return followRedirectsExports;
 }
 
-var _args = [
-	[
-		"axios@0.21.2",
-		"/home/abakken/dev/fisk"
-	]
-];
-var _from = "axios@0.21.2";
-var _id = "axios@0.21.2";
-var _inBundle = false;
-var _integrity = "sha512-87otirqUw3e8CzHTMO+/9kh/FSgXt/eVDvipijwDtEuwbkySWZ9SBm6VEubmJ/kLKEoLQV/POhxXFb66bfekfg==";
-var _location = "/axios";
-var _phantomChildren = {
+var name = "axios";
+var version = "0.21.2";
+var description = "Promise based HTTP client for the browser and node.js";
+var main = "index.js";
+var scripts = {
+	test: "grunt test",
+	start: "node ./sandbox/server.js",
+	build: "NODE_ENV=production grunt build",
+	preversion: "npm test",
+	version: "npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json",
+	postversion: "git push && git push --tags",
+	examples: "node ./examples/server.js",
+	coveralls: "cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
+	fix: "eslint --fix lib/**/*.js"
 };
-var _requested = {
-	type: "version",
-	registry: true,
-	raw: "axios@0.21.2",
-	name: "axios",
-	escapedName: "axios",
-	rawSpec: "0.21.2",
-	saveSpec: null,
-	fetchSpec: "0.21.2"
+var repository = {
+	type: "git",
+	url: "https://github.com/axios/axios.git"
 };
-var _requiredBy = [
-	"/"
+var keywords = [
+	"xhr",
+	"http",
+	"ajax",
+	"promise",
+	"node"
 ];
-var _resolved = "https://registry.npmjs.org/axios/-/axios-0.21.2.tgz";
-var _spec = "0.21.2";
-var _where = "/home/abakken/dev/fisk";
-var author = {
-	name: "Matt Zabriskie"
-};
-var browser = {
-	"./lib/adapters/http.js": "./lib/adapters/xhr.js"
-};
+var author = "Matt Zabriskie";
+var license = "MIT";
 var bugs = {
 	url: "https://github.com/axios/axios/issues"
 };
-var bundlesize = [
-	{
-		path: "./dist/axios.min.js",
-		threshold: "5kB"
-	}
-];
-var dependencies = {
-	"follow-redirects": "^1.14.0"
-};
-var description = "Promise based HTTP client for the browser and node.js";
+var homepage = "https://axios-http.com";
 var devDependencies = {
 	coveralls: "^3.0.0",
 	"es6-promise": "^4.2.4",
@@ -54073,67 +54058,40 @@ var devDependencies = {
 	webpack: "^4.44.2",
 	"webpack-dev-server": "^3.11.0"
 };
-var homepage = "https://axios-http.com";
-var jsdelivr = "dist/axios.min.js";
-var keywords = [
-	"xhr",
-	"http",
-	"ajax",
-	"promise",
-	"node"
-];
-var license = "MIT";
-var main = "index.js";
-var name = "axios";
-var repository = {
-	type: "git",
-	url: "git+https://github.com/axios/axios.git"
-};
-var scripts = {
-	build: "NODE_ENV=production grunt build",
-	coveralls: "cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
-	examples: "node ./examples/server.js",
-	fix: "eslint --fix lib/**/*.js",
-	postversion: "git push && git push --tags",
-	preversion: "npm test",
-	start: "node ./sandbox/server.js",
-	test: "grunt test",
-	version: "npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json"
+var browser = {
+	"./lib/adapters/http.js": "./lib/adapters/xhr.js"
 };
-var typings = "./index.d.ts";
+var jsdelivr = "dist/axios.min.js";
 var unpkg = "dist/axios.min.js";
-var version = "0.21.2";
+var typings = "./index.d.ts";
+var dependencies = {
+	"follow-redirects": "^1.14.0"
+};
+var bundlesize = [
+	{
+		path: "./dist/axios.min.js",
+		threshold: "5kB"
+	}
+];
 var require$$0 = {
-	_args: _args,
-	_from: _from,
-	_id: _id,
-	_inBundle: _inBundle,
-	_integrity: _integrity,
-	_location: _location,
-	_phantomChildren: _phantomChildren,
-	_requested: _requested,
-	_requiredBy: _requiredBy,
-	_resolved: _resolved,
-	_spec: _spec,
-	_where: _where,
+	name: name,
+	version: version,
+	description: description,
+	main: main,
+	scripts: scripts,
+	repository: repository,
+	keywords: keywords,
 	author: author,
-	browser: browser,
+	license: license,
 	bugs: bugs,
-	bundlesize: bundlesize,
-	dependencies: dependencies,
-	description: description,
-	devDependencies: devDependencies,
 	homepage: homepage,
+	devDependencies: devDependencies,
+	browser: browser,
 	jsdelivr: jsdelivr,
-	keywords: keywords,
-	license: license,
-	main: main,
-	name: name,
-	repository: repository,
-	scripts: scripts,
-	typings: typings,
 	unpkg: unpkg,
-	version: version
+	typings: typings,
+	dependencies: dependencies,
+	bundlesize: bundlesize
 };
 
 var http_1;
@@ -55989,20 +55947,28 @@ server.on("job", (job) => {
                     return;
                 }
                 // this can't be async, the directory is removed after the event is fired
-                const forCache = event.files.map((f) => ({
-                    contents: fs$3.readFileSync(f.absolute),
-                    path: f.path
-                }));
-                const contents = !j.job.compressed
-                    ? forCache
-                    : forCache.map((x) => ({
-                        path: x.path,
-                        contents: x.contents.byteLength ? zlib__default["default"].gzipSync(x.contents) : x.contents
-                    }));
+                const contents = event.files.map((f) => {
+                    let fileContents = fs$3.readFileSync(f.absolute);
+                    let uncompressed;
+                    if (j.job.compressed) {
+                        uncompressed = fileContents;
+                        fileContents = zlib__default["default"].gzipSync(fileContents);
+                    }
+                    return {
+                        contents: fileContents,
+                        uncompressed,
+                        path: f.path
+                    };
+                });
                 const response = {
                     type: "response",
                     index: contents.map((item) => {
-                        return { path: item.path, bytes: item.contents.length };
+                        var _a, _b;
+                        return {
+                            path: item.path,
+                            bytes: item.contents.length,
+                            uncompressedSize: (_b = (_a = item.uncompressed) === null || _a === void 0 ? void 0 : _a.byteLength) !== null && _b !== void 0 ? _b : item.contents.byteLength
+                        };
                     }),
                     success: event.success,
                     exitCode: event.exitCode,
@@ -56025,7 +55991,7 @@ server.on("job", (job) => {
                     response.sourceFile = jobJob.sourceFile;
                     response.commandLine = jobJob.commandLine;
                     response.environment = jobJob.hash;
-                    objectCache.add(response, forCache);
+                    objectCache.add(response, contents);
                 }
                 contents.forEach((x) => {
                     if (x.contents.byteLength) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@andersbakken/fisk",
-    "version": "4.0.35",
+    "version": "4.0.37",
     "description": "Fisk, a distributed compile system",
     "scripts": {
         "lint": "eslint . --ext .ts",
@@ -30,7 +30,8 @@
     ],
     "dependencies": {
         "@andersbakken/blessed": "^0.1.82",
-        "@jhanssen/options": "^5.0.0",
+        "@andersbakken/fisk-native": "^13.0.0",
+        "@jhanssen/options": "^10.0.0",
         "axios": "^0.21.1",
         "bufferutil": "^4.0.7",
         "bytes": "^3.0.0",
@@ -41,7 +42,6 @@
         "lowdb": "^1.0.0",
         "minimist": "^1.2.5",
         "mktemp": "^0.4.0",
-        "posix": "^4.2.0",
         "pretty-bytes": "^6.0.0",
         "typescript": "^5.2.2",
         "url-parse": "^1.5.10",
@@ -59,7 +59,6 @@
         "@types/humanize-duration": "^3.27.1",
         "@types/minimist": "^1.2.2",
         "@types/node": "^14.18.63",
-        "@types/posix": "^4.2.0",
         "@types/url-parse": "^1.4.8",
         "@types/ws": "^8.5.3",
         "@typescript-eslint/eslint-plugin": "^6.9.0",

package/scheduler/fisk-scheduler.js

@@ -21,8 +21,8 @@ var require$$0$7 = require('tty');
 var require$$0$8 = require('buffer');
 var require$$1$3 = require('string_decoder');
 var require$$8 = require('querystring');
+var fiskNative = require('@andersbakken/fisk-native');
 var require$$1$4 = require('module');
-var posix = require('posix');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -47,7 +47,6 @@ var require$$0__default$5 = /*#__PURE__*/_interopDefaultLegacy(require$$0$8);
 var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$3);
 var require$$8__default = /*#__PURE__*/_interopDefaultLegacy(require$$8);
 var require$$1__default$3 = /*#__PURE__*/_interopDefaultLegacy(require$$1$4);
-var posix__default = /*#__PURE__*/_interopDefaultLegacy(posix);
 
 class Database {
     constructor(path) {
@@ -55371,7 +55370,7 @@ Environments.instance
     const limit = option.int("max-file-descriptors");
     if (limit) {
         console.log("setting limit", limit);
-        posix__default["default"].setrlimit("nofile", { soft: limit });
+        fiskNative.setrlimit("nofile", { soft: limit });
     }
 })
     .then(purgeEnvironmentsToMaxSize)