@gjsify/os 0.0.1 → 0.0.3

package/lib/esm/index.js

@@ -0,0 +1,92 @@
+import { cli, getPathSeparator, getOs } from "@gjsify/utils";
+import * as linux from "./linux.js";
+import * as darwin from "./darwin.js";
+import GLib from "@girs/glib-2.0";
+import constants from "./constants.js";
+const EOL = getPathSeparator() === "/" ? "\n" : "\r\n";
+const homedir = () => GLib.get_home_dir();
+const hostname = () => GLib.get_host_name();
+const release = () => cli("uname -r");
+const tmpdir = () => GLib.get_tmp_dir();
+const type = () => cli("uname");
+const userInfo = () => ({
+  uid: 1e3,
+  gid: 100,
+  username: GLib.get_user_name(),
+  homedir: GLib.get_home_dir()
+});
+const cpus = () => {
+  const _os = getOs();
+  switch (_os) {
+    case "darwin":
+      return darwin.cpus();
+    case "linux":
+      return linux.cpus();
+    default:
+      console.warn(`${_os} is not supported!`);
+      break;
+  }
+};
+const endianness = () => {
+  const _os = getOs();
+  switch (_os) {
+    case "darwin":
+      return darwin.endianness();
+    case "linux":
+      return linux.endianness();
+    default:
+      console.warn(`${_os} is not supported!`);
+      break;
+  }
+};
+const freemem = () => {
+  const _os = getOs();
+  switch (_os) {
+    case "darwin":
+      return darwin.freemem();
+    case "linux":
+      return linux.freemem();
+    default:
+      console.warn(`${_os} is not supported!`);
+      break;
+  }
+};
+const loadavg = () => {
+  const _os = getOs();
+  switch (_os) {
+    case "darwin":
+      return darwin.loadavg();
+    case "linux":
+      return linux.loadavg();
+    default:
+      console.warn(`${_os} is not supported!`);
+      break;
+  }
+};
+const networkInterfaces = () => {
+  const _os = getOs();
+  switch (_os) {
+    case "darwin":
+      return darwin.networkInterfaces();
+    case "linux":
+      return linux.networkInterfaces();
+    default:
+      console.warn(`${_os} is not supported!`);
+      break;
+  }
+};
+export {
+  EOL,
+  constants,
+  cpus,
+  endianness,
+  freemem,
+  homedir,
+  hostname,
+  loadavg,
+  networkInterfaces,
+  release,
+  tmpdir,
+  type,
+  userInfo
+};

package/lib/esm/linux.js

@@ -0,0 +1,92 @@
+import { createSubnet } from "./createSubnet.js";
+import { cli } from "@gjsify/utils";
+const EOL = /\r\n|\n/;
+const getIPv4Subnet = createSubnet(32, 8, 10, ".");
+const getIPv6Subnet = createSubnet(128, 16, 16, ":");
+function parseInterfaces(info) {
+  info = info.trim();
+  if (info.length < 1)
+    return;
+  let iface = [], mac;
+  for (let line, lines = info.split(EOL), i = 0; i < lines.length; i++) {
+    line = lines[i];
+    switch (true) {
+      case /link\/\S+\s+((?:\S{2}:)+\S{2})/.test(line):
+        mac = RegExp.$1;
+        break;
+      case /inet(\d*)\s+(\S+)/.test(line):
+        let ip = RegExp.$2.split("/"), v = RegExp.$1 || "4";
+        iface.push({
+          address: ip[0],
+          netmask: (v === "4" ? getIPv4Subnet : getIPv6Subnet)(ip[1]),
+          family: "IPv" + v,
+          mac,
+          internal: ip[0] === "127.0.0.1"
+        });
+        break;
+    }
+  }
+  if (mac)
+    this[info.slice(0, info.indexOf(":"))] = iface;
+}
+;
+const cpus = () => {
+  const PROCESSOR = /^processor\s*:\s*(\d+)/i;
+  const NAME = /^model[\s_]+name\s*:([^\r\n]+)/i;
+  const FREQ = /^cpu[\s_]+MHz\s*:\s*(\d+)/i;
+  const cpus2 = [];
+  let cpu;
+  cli("cat /proc/cpuinfo").split(EOL).forEach((line) => {
+    switch (true) {
+      case PROCESSOR.test(line):
+        cpus2[RegExp.$1.trim()] = cpu = {
+          model: "",
+          speed: 0,
+          get times() {
+            return {};
+          }
+        };
+        break;
+      case NAME.test(line):
+        cpu.model = RegExp.$1.trim();
+        break;
+      case FREQ.test(line):
+        cpu.speed = parseFloat(RegExp.$1.trim());
+        break;
+    }
+  });
+  return cpus2;
+};
+const endianness = () => "LE";
+const freemem = () => {
+  let I, mem = cli("free -b").split(EOL);
+  mem[0].split(/\s+/).some((info, i) => info === "free" && (I = i));
+  return parseFloat(mem[1].split(/\s+/)[I + 1]);
+};
+const loadavg = () => /(\d+(?:\.\d+))\s+(\d+(?:\.\d+))\s+(\d+(?:\.\d+))/.test(
+  cli("cat /proc/loadavg")
+) && [
+  parseFloat(RegExp.$1),
+  parseFloat(RegExp.$2),
+  parseFloat(RegExp.$3)
+];
+const networkInterfaces = () => {
+  const ifaces = {};
+  cli("ip addr").split(/^\d+:\s+/m).forEach(parseInterfaces, ifaces);
+  return ifaces;
+};
+const totalmem = () => {
+  let I, mem = cli("free -b").split(EOL);
+  mem[0].split(/\s+/).some((info, i) => info === "total" && (I = i));
+  return parseFloat(mem[1].split(/\s+/)[I + 1]);
+};
+const uptime = () => (Date.now() - Date.parse(cli("uptime -s").replace(" ", "T"))) / 1e3;
+export {
+  cpus,
+  endianness,
+  freemem,
+  loadavg,
+  networkInterfaces,
+  totalmem,
+  uptime
+};

package/lib/esm/win32.js

@@ -0,0 +1 @@
+console.warn("os core module is not fully supported here");

package/package.json

@@ -1,28 +1,44 @@
 {
   "name": "@gjsify/os",
-  "version": "0.0.1",
-  "description": "os core module for gjs",
+  "version": "0.0.3",
+  "description": "Node.js os module for Gjs",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./lib/types/index.d.ts",
+        "default": "./lib/esm/index.js"
+      },
+      "require": {
+        "types": "./lib/types/index.d.ts",
+        "default": "./lib/cjs/index.js"
+      }
+    }
+  },
   "scripts": {
-    "test": "cgjs ./test"
+    "clear": "rm -rf lib tsconfig.tsbuildinfo test.gjs.mjs test.node.mjs",
+    "print:name": "echo '@gjsify/os'",
+    "build": "yarn print:name && yarn build:gjsify",
+    "build:gjsify": "gjsify build --library 'src/**/*.{ts,js}' --exclude 'src/**/*.spec.{mts,ts}' 'src/test.{mts,ts}'",
+    "build:test": "yarn build:test:gjs && yarn build:test:node",
+    "build:test:gjs": "gjsify build src/test.mts --app gjs --outfile test.gjs.mjs",
+    "build:test:node": "gjsify build src/test.mts --app node --outfile test.node.mjs",
+    "test": "yarn print:name && yarn build:gjsify && yarn build:test && yarn test:node && yarn test:gjs",
+    "test:gjs": "gjs -m test.gjs.mjs",
+    "test:node": "node test.node.mjs"
   },
   "keywords": [
     "gjs",
-    "require",
-    "commonjs",
-    "npm",
     "node",
-    "gtk",
-    "native",
-    "cgjs",
     "os"
   ],
-  "author": "Andrea Giammarchi",
-  "license": "ISC",
-  "main": "index.js",
-  "repository": "github:cgjs/cgjs",
-  "bugs": "https://github.com/gjsify/os/issues",
-  "homepage": "https://github.com/gjsify/os/tree/master/packages/os#readme",
+  "dependencies": {
+    "@girs/gjs": "^3.1.0",
+    "@gjsify/utils": "^0.0.3"
+  },
   "devDependencies": {
-    "cgjs": "^0.1.28"
+    "@gjsify/cli": "^0.0.3"
   }
-}
+}

package/src/{constants.js → constants.ts}

@@ -1,5 +1,5 @@
 // this is a copy and paste from node
-module.exports = {
+export default {
   "UV_UDP_REUSEADDR": 4,
   "errno": {
     "E2BIG": 7,

package/src/{createSubnet.js → createSubnet.ts}

@@ -1,4 +1,4 @@
-module.exports = function createSubnet(size, segment, base, sep) {
+export function createSubnet(size, segment, base, sep) {
   const empty = '0'.repeat(size);
   return  mask => {
     const str = ('1'.repeat(parseInt(mask, 10)) + empty).slice(0, size);
@@ -9,3 +9,5 @@ module.exports = function createSubnet(size, segment, base, sep) {
     return out.join(sep);
   };
 };
+
+export default { createSubnet }

package/src/{darwin.js → darwin.ts}

@@ -1,17 +1,60 @@
-const createSubnet = require('./createSubnet');
-const system = require('./system.js');
+import { createSubnet } from './createSubnet.js';
+import { cli } from '@gjsify/utils';
+
 const EOL = /\r\n|\n/;
 const NOMAC = '00:00:00:00:00:00';
 
 const getIPv6Subnet = createSubnet(128, 16, 16, ':');
 
-this.cpus = () => {
-  let cores = parseFloat(system('sysctl -n hw.ncpu'));
+const parseInterfaces = function(info) {
+  info = info.trim();
+  if (info.length < 1 || !/\binet\b/.test(info)) return;
+  const lines = info.split('\n');
+  const iface = [];
+  const length = lines.length;
+  let mac = NOMAC;
+  for (let line, i = 0; i < length; i++) {
+    line = lines[i];
+    switch (true) {
+      case /ether\s+((?:\S{2}:)+\S{2})/.test(line):
+        mac = RegExp.$1;
+        break;
+      case /inet\s+(\d+\.\d+\.\d+\.\d+)\s+netmask\s+0x(.{2})(.{2})(.{2})(.{2})/.test(line):
+        iface.push({
+          address: RegExp.$1,
+          netmask: [
+            parseInt(RegExp.$2, 16),
+            parseInt(RegExp.$3, 16),
+            parseInt(RegExp.$4, 16),
+            parseInt(RegExp.$5, 16)
+          ].join('.'),
+          family: 'IPv4',
+          mac: mac,
+          internal: RegExp.$1 === '127.0.0.1'
+        });
+        break;
+      case /inet6\s+((?:\S{0,4}:)+\S{1,4}).+?prefixlen\s+(\d+)/.test(line):
+        iface.push({
+          address: RegExp.$1,
+          netmask: getIPv6Subnet(RegExp.$2),
+          family: 'IPv6',
+          mac: mac,
+          internal: mac !== NOMAC
+        });
+        break;
+    }
+  }
+  this[info.slice(0, info.indexOf(':'))] = iface;
+};
+
+// PORTED TO deno runtime
+export const cpus = () => {
+  let cores = parseFloat(cli('sysctl -n hw.ncpu'));
   const cpus = [];
   while (cores--) {
     cpus.push({
-      model: system('sysctl -n machdep.cpu.brand_string').replace(/\s+/g, ' '),
-      speed: parseFloat(system('sysctl -n hw.cpufrequency')) / 1000 / 1000,
+      model: cli('sysctl -n machdep.cpu.brand_string').replace(/\s+/g, ' '),
+      speed: parseFloat(cli('sysctl -n hw.cpufrequency')) / 1000 / 1000,
       get times() {
         console.warn('cpus.times is not supported');
         return {};
@@ -21,23 +64,25 @@ this.cpus = () => {
   return cpus;
 };
 
-this.endianness = () => 'LE';
+export const endianness = () => 'LE';
 
-this.freemem = () =>  parseFloat(system('sysctl -n hw.memsize')) -
-                      parseFloat(system('sysctl -n hw.physmem'));
+// PORTED TO deno runtime
+export const freemem = () =>  parseFloat(cli('sysctl -n hw.memsize')) -
+                      parseFloat(cli('sysctl -n hw.physmem'));
 
-this.loadavg = () => /load\s+averages:\s+(\d+(?:\.\d+))\s+(\d+(?:\.\d+))\s+(\d+(?:\.\d+))/.test(
-    system('uptime')
+// PORTED TO deno runtime          
+export const loadavg = () => /load\s+averages:\s+(\d+(?:\.\d+))\s+(\d+(?:\.\d+))\s+(\d+(?:\.\d+))/.test(
+    cli('uptime')
   ) && [
     parseFloat(RegExp.$1),
     parseFloat(RegExp.$2),
     parseFloat(RegExp.$3)
   ];
 
-this.networkInterfaces = () => {
+export const networkInterfaces = () => {
   const ifaces = {};
   const groups = [];
-  const lines = system('ifconfig').split(EOL);
+  const lines = cli('ifconfig').split(EOL);
   const length = lines.length;
   for (let
     group = [],
@@ -52,20 +97,22 @@ this.networkInterfaces = () => {
       }
       --i;
     }
-    groups.push(group.join(EOL));
+    groups.push(group.join(EOL as any)); // TODO check this
   }
   groups.forEach(parseInterfaces, ifaces);
   return ifaces;
 };
 
-this.totalmem = () => {
-  let I, mem = system('free -b').split(EOL);
+// PORTED TO deno runtime
+export const totalmem = () => {
+  let I: number, mem = cli('free -b').split(EOL);
   mem[0].split(/\s+/).some((info, i) => info === 'total' && (I = i));
   return parseFloat(mem[1].split(/\s+/)[I + 1]);
 };
 
-this.uptime = () => {
-  const uptime = system('uptime');
+// PORTED TO deno runtime
+export const uptime = () => {
+  const uptime = cli('uptime');
   const up = /up\s+([^,]+)?,/.test(uptime) && RegExp.$1;
   switch (true) {
     case /^(\d+):(\d+)$/.test(up):
@@ -82,44 +129,3 @@ this.uptime = () => {
   }
   return up;
 };
-
-function parseInterfaces(info) {
-  info = info.trim();
-  if (info.length < 1 || !/\binet\b/.test(info)) return;
-  const lines = info.split('\n');
-  const iface = [];
-  const length = lines.length;
-  let mac = NOMAC;
-  for (let line, i = 0; i < length; i++) {
-    line = lines[i];
-    switch (true) {
-      case /ether\s+((?:\S{2}:)+\S{2})/.test(line):
-        mac = RegExp.$1;
-        break;
-      case /inet\s+(\d+\.\d+\.\d+\.\d+)\s+netmask\s+0x(.{2})(.{2})(.{2})(.{2})/.test(line):
-        iface.push({
-          address: RegExp.$1,
-          netmask: [
-            parseInt(RegExp.$2, 16),
-            parseInt(RegExp.$3, 16),
-            parseInt(RegExp.$4, 16),
-            parseInt(RegExp.$5, 16)
-          ].join('.'),
-          family: 'IPv4',
-          mac: mac,
-          internal: RegExp.$1 === '127.0.0.1'
-        });
-        break;
-      case /inet6\s+((?:\S{0,4}:)+\S{1,4}).+?prefixlen\s+(\d+)/.test(line):
-        iface.push({
-          address: RegExp.$1,
-          netmask: getIPv6Subnet(RegExp.$2),
-          family: 'IPv6',
-          mac: mac,
-          internal: mac !== NOMAC
-        });
-        break;
-    }
-  }
-  this[info.slice(0, info.indexOf(':'))] = iface;
-};

package/src/index.spec.ts

@@ -0,0 +1,9 @@
+import { describe, it, expect } from '@gjsify/unit';
+
+export default async () => {
+	await describe('true', async () => {
+		await it('should be true', async () => {
+			expect(true).toBeTruthy();
+		});
+	});
+}

package/src/index.ts

@@ -0,0 +1,103 @@
+import { cli, getPathSeparator, getOs } from '@gjsify/utils';
+
+export { constants }
+
+import * as linux from './linux.js';
+import * as darwin from './darwin.js';
+import GLib from '@girs/glib-2.0';
+
+import constants from './constants.js';
+
+export const EOL = getPathSeparator() === '/' ? '\n' : '\r\n';
+
+// Ported to packages/deno/std/node/os.ts
+export const homedir = () => GLib.get_home_dir();
+
+// Ported to deno runtime
+export const hostname = () => GLib.get_host_name();
+
+// Ported to deno runtime
+export const release = () => cli('uname -r');
+
+// Ported to packages/deno/std/node/os.ts
+export const tmpdir = () => GLib.get_tmp_dir();
+
+// Existing replacement in packages/deno/std/node/os.ts
+export const type = () => cli('uname');
+
+// Ported to packages/deno/std/node/os.ts
+export const userInfo = () => ({
+  uid: 1000,
+  gid: 100,
+  username: GLib.get_user_name(),
+  homedir: GLib.get_home_dir()
+});
+
+// Ported to packages/deno/std/node/os.ts
+export const cpus = () => {
+  const _os = getOs();
+  switch (_os) {
+    case "darwin":
+      return darwin.cpus();
+    case "linux":
+      return linux.cpus();
+    default:
+      console.warn(`${_os} is not supported!`);
+      break;
+  }
+};
+
+// Existing replacement in packages/deno/std/node/os.ts
+export const endianness = () => {
+  const _os = getOs();
+  switch (_os) {
+    case "darwin":
+      return darwin.endianness();
+    case "linux":
+      return linux.endianness();
+    default:
+      console.warn(`${_os} is not supported!`);
+      break;
+  }
+};
+
+// Ported to packages/deno/std/node/os.ts
+export const freemem = () => {
+  const _os = getOs();
+  switch (_os) {
+    case "darwin":
+      return darwin.freemem();
+    case "linux":
+      return linux.freemem();
+    default:
+      console.warn(`${_os} is not supported!`);
+      break;
+  }
+};
+
+// Ported to packages/deno/std/node/os.ts
+export const loadavg = () => {
+  const _os = getOs();
+  switch (_os) {
+    case "darwin":
+      return darwin.loadavg();
+    case "linux":
+      return linux.loadavg();
+    default:
+      console.warn(`${_os} is not supported!`);
+      break;
+  }
+}
+
+export const networkInterfaces = () => {
+  const _os = getOs();
+  switch (_os) {
+    case "darwin":
+      return darwin.networkInterfaces();
+    case "linux":
+      return linux.networkInterfaces();
+    default:
+      console.warn(`${_os} is not supported!`);
+      break;
+  }
+};