Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: UDP direct hole punching, high CPU usage and misc. #130

Closed
wants to merge 4 commits into from
Closed

Fix: UDP direct hole punching, high CPU usage and misc. #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16a7c9c
Add direct hole punching to gRPC server
robert-cronin Nov 9, 2020
9d86858
wip
robert-cronin Nov 9, 2020
f509853
Update nix-build files
robert-cronin Oct 19, 2020
e3d3d22
Add direct hole punching to gRPC server
robert-cronin Nov 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 22 additions & 30 deletions nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,47 @@
{ pkgs ? import ../pkgs.nix {} }:

with pkgs;
let

in

stdenv.mkDerivation rec {
pname = "polykey-cli";
version = "0.0.17";
version = "0.0.20";
name = "${pname}-${version}";

nativeBuildInputs = [
makeWrapper
nodejs
nodejs-12_x
nodePackages.node2nix
];

buildInputs = [
nodejs
nodejs-12_x
nodePackages.node2nix
];

src = ../.;
src = nix-gitignore.gitignoreSource [] ../.;

nodeDependencies = (import ./node-dependencies.nix {
inherit system;
inherit pkgs;
# pkgs = args // { };
inherit system pkgs;
nodejs = nodejs-12_x;
polykey-src = src;
}).package;

buildPhase = ''
ln -s ${nodeDependencies}/lib/node_modules ./node_modules
export PATH="${nodeDependencies}/bin:$PATH"
export PATH="$(pwd)/dist/bin:$(npm bin):$PATH"
dev_node_modules="${nodeDependencies}/lib/node_modules/@matrixai/polykey/node_modules";
ln -s -T "$dev_node_modules" "./node_modules"

cd ${src}
ls
npm run build:webpack
npm run build:all
cp -r dist $out/
'';

installPhase = ''
# Linux only.
mkdir -p "$out/bin"
# For exposing the polykey cli
declare target="$(readlink -f "$out/lib/node_modules")"
ln -s -T "${nodeDependencies}/bin/polykey" "$out/bin/pk"
ln -s -T "${nodeDependencies}/bin/polykey" "$out/bin/polykey-cli"
mkdir $out
cp -r bin $out
cp -r dist $out
cp -r proto $out
cp package.json $out
cp openapi.yaml $out

wrapProgram "$out/bin/polykey" \
--set PATH ${lib.makeBinPath [
nodejs-12_x
]}

ln -s -T "$dev_node_modules" "$out/node_modules"

ln -s -T "$out/bin/polykey" "$out/bin/pk"
ln -s -T "$out/bin/polykey" "$out/bin/polykey-cli"
'';
}
Loading