Rewrite imports

Author: thgh

deno/src/context.ts

@@ -1,10 +1,11 @@
-import { Duplex, finished } from "stream";
-import { Stream, STREAM_CHUNK_SIZE } from "./stream";
-import { ID } from "./kademlia";
-import util from "util";
-import { DataPacket, Opcode, ServiceResponsePacket } from "./packet";
-import { Provider } from "./provider";
-import { chunkBuffer } from "./node";
+import { Buffer } from "https://deno.land/std/node/buffer.ts";
+import { Duplex, finished } from "https://jspm.dev/stream";
+import { Stream, STREAM_CHUNK_SIZE } from "./stream.ts";
+import { ID } from "./kademlia.ts";
+import * as util from 'https://deno.land/std/node/util.ts'
+import { DataPacket, Opcode, ServiceResponsePacket } from "./packet.ts";
+import { Provider } from "./provider.ts";
+import { chunkBuffer } from "./node.ts";
 
 export type Handler = (ctx: Context) => void;
 

deno/src/kademlia.ts

@@ -1,6 +1,7 @@
-import nacl from "tweetnacl";
-import ipaddr, { IPv4, IPv6 } from "ipaddr.js";
-import assert from "assert";
+import { Buffer } from "https://deno.land/std/node/buffer.ts";
+import nacl from "https://deno.land/x/tweetnacl_deno/src/nacl.ts";
+import ipaddr, { IPv4, IPv6 } from "https://jspm.dev/ipaddr.js";
+import assert from "https://deno.land/std/testing/asserts.ts";
 
 export enum UpdateResult {
   New,

deno/src/mod.ts

@@ -1,14 +1,14 @@
-export { Node, generateSecretKey } from "./node";
-export { Context } from "./context";
-export { ID, Table, UpdateResult } from "./kademlia";
-export { getAvailableAddress, splitHostPort } from "./net";
-export { Provider } from "./provider";
-export { x25519, serverHandshake, clientHandshake, Session } from "./session";
+export { Node, generateSecretKey } from "./node.ts";
+export { Context } from "./context.ts";
+export { ID, Table, UpdateResult } from "./kademlia.ts";
+export { getAvailableAddress, splitHostPort } from "./net.ts";
+export { Provider } from "./provider.ts";
+export { x25519, serverHandshake, clientHandshake, Session } from "./session.ts";
 export {
   drain,
   lengthPrefixed,
   prefixLength,
   RPC,
   Stream,
   Streams,
-} from "./stream";
+} from "./stream.ts";

deno/src/net.ts

@@ -1,7 +1,7 @@
-import { IPv4, IPv6 } from "ipaddr.js";
-import net from "net";
-import events from "events";
-import ipaddr from "ipaddr.js";
+import { IPv4, IPv6 } from "https://jspm.dev/ipaddr.js";
+import net from "./std-node-net.ts";
+import events from "https://deno.land/std/node/events.ts";
+import ipaddr from "https://jspm.dev/ipaddr.js";
 
 /**
  * Returns an available TCP host/port that may be listened to.

deno/src/node.ts

@@ -1,9 +1,10 @@
-import { Context, Handler } from "./context";
-import net from "net";
-import { ID, Table } from "./kademlia";
-import nacl from "tweetnacl";
-import { getAvailableAddress, splitHostPort } from "./net";
-import { IPv4, IPv6 } from "ipaddr.js";
+import { Buffer } from "https://deno.land/std/node/buffer.ts";
+import { Context, Handler } from "./context.ts";
+// import net from "net";
+import { ID, Table } from "./kademlia.ts";
+import * as nacl from 'https://deno.land/x/tweetnacl_deno/src/nacl.ts'
+import { getAvailableAddress, splitHostPort } from "./net.ts";
+import ipaddr from "https://jspm.dev/ipaddr.js";
 import {
   DataPacket,
   FindNodeRequest,
@@ -12,11 +13,11 @@ import {
   Opcode,
   ServiceRequestPacket,
   ServiceResponsePacket,
-} from "./packet";
-import events from "events";
-import { clientHandshake, serverHandshake, Session } from "./session";
-import hash from "object-hash";
-import { Provider } from "./provider";
+} from "./packet.ts";
+import events from "https://deno.land/std/node/events.ts";
+import { clientHandshake, serverHandshake, Session } from "./session.ts";
+import { Provider } from "./provider.ts";
+import hash from "https://jspm.dev/object-hash";
 
 const debug = require("debug")("flatend");
 
@@ -74,7 +75,7 @@ export class Node {
         }
       }
 
-      let publicHost: IPv4 | IPv6;
+      let publicHost: ipaddr.IPv4 | ipaddr.IPv6;
       let publicPort: number;
 
       if (opts.publicAddr) {

deno/src/packet.ts

@@ -1,6 +1,7 @@
-import nacl from "tweetnacl";
-import assert from "assert";
-import { ID } from "./kademlia";
+import { Buffer } from "https://deno.land/std/node/buffer.ts";
+import nacl from "https://deno.land/x/tweetnacl_deno/src/nacl.ts";
+import assert from "https://deno.land/std/testing/asserts.ts";
+import { ID } from "./kademlia.ts";
 
 export enum Opcode {
   Handshake,

deno/src/provider.ts

@@ -1,15 +1,16 @@
-import { ID } from "./kademlia";
-import net from "net";
-import { Session } from "./session";
+import { Buffer } from "https://deno.land/std/node/buffer.ts";
+import { ID } from "./kademlia.ts";
+import net from "./std-node-net.ts";
+import { Session } from "./session.ts";
 import {
   drain,
   lengthPrefixed,
   prefixLength,
   RPC,
   Stream,
   Streams,
-} from "./stream";
-import { Opcode } from "./packet";
+} from "./stream.ts";
+import { Opcode } from "./packet.ts";
 
 export class Provider {
   id?: ID;

deno/src/session.ts

@@ -1,12 +1,13 @@
-import net from "net";
-import nacl from "tweetnacl";
-import events from "events";
-import crypto from "crypto";
+import { Buffer } from "https://deno.land/std/node/buffer.ts";
+import * as net from "./std-node-net.ts";
+import nacl from "https://deno.land/x/tweetnacl_deno/src/nacl.ts";
+import events from "https://deno.land/std/node/events.ts";
+import crypto from "./std-node-crypto.ts";
 
-const blake2b = require("blake2b");
+import { blake2b } from "https://deno.land/x/blake2b/mod.ts";
 
 export function x25519(privateKey: Uint8Array, publicKey: Uint8Array): Buffer {
-  return blake2b(32).update(nacl.scalarMult(privateKey, publicKey)).digest();
+  return blake2b(nacl.scalarMult(privateKey, publicKey), "", "", 32);
 }
 
 export async function serverHandshake(conn: net.Socket): Promise<Uint8Array> {

deno/src/std-node-crypto.ts

@@ -0,0 +1 @@
+export default {} as any

deno/src/std-node-net.ts

@@ -0,0 +1 @@
+export default {} as any