Skip to content

Commit

Permalink
Removes microtime dependency (#1036)
Browse files Browse the repository at this point in the history
* removes microtime dependency

* lint fix

* reverting mt fix

* removes microtime
  • Loading branch information
jaredperreault-okta authored Sep 13, 2022
1 parent 601e7dc commit 6685ea1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ shelljs_*
test_tmp/
tmp/
.eslintcache
dist/**/*.bak
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
"lint": "eslint src test config --cache",
"clear": "rimraf -rf ./dist && rimraf -rf ./gen",
"build:es6node": "rimraf -rf dist/esnode && cross-env NODE_ENV=es6 babel src --out-dir dist/esnode && echo '{ \"type\": \"module\" }' > dist/esnode/package.json",
"build:es6browser": "rimraf -rf dist/esbrowser && cross-env NODE_ENV=es6 babel src --out-dir dist/esbrowser && grep -rl NodeMethod dist/esbrowser/ | xargs sed -i 's/.*NodeMethod.*//' && echo '{ \"type\": \"module\" }' > dist/esbrowser/package.json",
"build:es6browser": "rimraf -rf dist/esbrowser && cross-env NODE_ENV=es6 babel src --out-dir dist/esbrowser && grep -rl NodeMethod dist/esbrowser | xargs sed -i.bak '/.*NodeMethod.*/d' && echo '{ \"type\": \"module\" }' > dist/esbrowser/package.json",
"build:es5node": "cross-env NODE_ENV=es5 babel src --out-dir dist/es5node",
"build:es5browser": "cross-env NODE_ENV=es5 babel src --out-dir dist/lib && grep -rl NodeMethod dist/lib/ | xargs sed -i 's/.*NodeMethod.*//'",
"build:es5browser": "cross-env NODE_ENV=es5 babel src --out-dir dist/lib && grep -rl NodeMethod dist/lib | xargs sed -i.bak '/.*NodeMethod.*/d'",
"build:test": "cross-env NODE_ENV=es5 babel test --out-dir test_tmp",
"build:index": "browserify test_tmp/scripts/index.js > docs/index.js",
"build:browser": "browserify test_tmp/scripts/e2e.js > docs/e2e.js",
Expand All @@ -84,7 +84,6 @@
"dependencies": {
"@babel/runtime": "^7.16.0",
"detect-node": "^2.1.0",
"microtime": "3.1.1",
"oblivious-set": "1.1.1",
"p-queue": "6.6.2",
"rimraf": "3.0.2",
Expand Down
14 changes: 8 additions & 6 deletions src/methods/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import os from 'os';
import events from 'events';
import net from 'net';
import path from 'path';
import micro from 'microtime';
import rimraf from 'rimraf';
import isNode from 'detect-node';
import PQueue from 'p-queue';
Expand Down Expand Up @@ -357,16 +356,14 @@ export function readMessage(messageObj) {
}

export async function cleanOldMessages(messageObjects, ttl) {
const olderThen = Date.now() - ttl;
const olderThen = microSeconds() - (ttl * 1000); // convert ttl to microseconds
await Promise.all(
messageObjects
.filter(obj => (obj.time / 1000) < olderThen)
.filter(obj => obj.time < olderThen)
.map(obj => unlink(obj.path).catch(() => null))
);
}



export const type = 'node';

/**
Expand Down Expand Up @@ -681,5 +678,10 @@ export function averageResponseTime() {
}

export function microSeconds() {
return parseInt(micro.now());
// convert nano to micro seconds
return parseInt(now() / 1000);
}

function now() {
return Number(process.hrtime.bigint()); // returns nanoseconds
}

0 comments on commit 6685ea1

Please sign in to comment.