feat(std/node): add os.type() implementation

Refs: https://github.com/denoland/deno/issues/3802
jbergstroem · Mar 30, 2020 · b7b690b · b7b690b
1 parent 6ae4744
commit b7b690b
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -57,6 +57,7 @@ termcolor = "1.1.0"
 tokio = { version = "0.2.13", features = ["rt-core", "tcp", "udp", "uds", "process", "fs", "blocking", "sync", "io-std", "macros", "time"] }
 tokio-rustls = "0.13.0"
 url = "2.1.1"
+uname = "0.1.1"
 utime = "0.2.1"
 webpki = "0.21.2"
 webpki-roots = "0.19.0"

diff --git a/cli/js/deno.ts b/cli/js/deno.ts
@@ -85,6 +85,7 @@ export {
   execPath,
   hostname,
   loadavg,
+  type,
   osRelease,
 } from "./ops/os.ts";
 export {

diff --git a/cli/js/lib.deno.ns.d.ts b/cli/js/lib.deno.ns.d.ts
@@ -836,6 +836,12 @@ declare namespace Deno {
   /** Read `r` until `Deno.EOF` and returns the content as `Uint8Array`. */
   export function readAllSync(r: SyncReader): Uint8Array;
 
+  /** Returns the operating system name as returned by uname(3).
+   *
+   *       console.log(Deno.type());
+   */
+  export function type(): string;
+
   /** Write all the content of `arr` to `w`. */
   export function writeAll(w: Writer, arr: Uint8Array): Promise<void>;
 

diff --git a/cli/js/ops/os.ts b/cli/js/ops/os.ts
@@ -14,6 +14,10 @@ export function osRelease(): string {
   return sendSync("op_os_release");
 }
 
+export function type(): string {
+  return sendSync("op_type");
+}
+
 export function exit(code = 0): never {
   sendSync("op_exit", { code });
   throw new Error("Code not reachable");

diff --git a/cli/js/tests/os_test.ts b/cli/js/tests/os_test.ts
@@ -335,3 +335,15 @@ unitTest({ perms: { env: false } }, function releasePerm(): void {
   }
   assert(caughtError);
 });
+
+unitTest({ perms: { env: true } }, function osType(): void {
+    const typeMatrix = {
+      'linux': 'Linux',
+      'mac': 'Darwin',
+      'win': 'Windows_NT',
+    };
+
+    assertNotEquals(Deno.type(), "");
+    assertEquals(Deno.type(), typeMatrix[Deno.build.os]);
+  }
+);
diff --git a/cli/ops/os.rs b/cli/ops/os.rs
@@ -7,6 +7,7 @@ use std::collections::HashMap;
 use std::env;
 use std::io::{Error, ErrorKind};
 use sys_info;
+use uname::uname;
 use url::Url;
 
 pub fn init(i: &mut Isolate, s: &State) {
@@ -18,6 +19,7 @@ pub fn init(i: &mut Isolate, s: &State) {
   i.register_op("op_get_dir", s.stateful_json_op(op_get_dir));
   i.register_op("op_hostname", s.stateful_json_op(op_hostname));
   i.register_op("op_loadavg", s.stateful_json_op(op_loadavg));
+  i.register_op("op_type", s.stateful_json_op(op_type));
   i.register_op("op_os_release", s.stateful_json_op(op_os_release));
 }
 
@@ -176,6 +178,16 @@ fn op_hostname(
   Ok(JsonOp::Sync(json!(hostname)))
 }
 
+fn op_type(
+  state: &State,
+  _args: Value,
+  _zero_copy: Option<ZeroCopyBuf>,
+) ->  Result<JsonOp, OpError> {
+  state.check_env()?;
+  let info = uname().unwrap().sysname;
+  Ok(JsonOp::Sync(json!(info)))
+}
+
 fn op_os_release(
   state: &State,
   _args: Value,

diff --git a/std/node/os.ts b/std/node/os.ts
@@ -190,9 +190,9 @@ export function totalmem(): number {
   notImplemented(SEE_GITHUB_ISSUE);
 }
 
-/** Not yet implemented */
+/** Returns the operating system name as returned by uname(3). */
 export function type(): string {
-  notImplemented(SEE_GITHUB_ISSUE);
+  return Deno.type();
 }
 
 /** Not yet implemented */