Compare commits
No commits in common. "v0.1.0-develop.12" and "master" have entirely different histories.
v0.1.0-dev
...
master
|
|
@ -1,13 +0,0 @@
|
||||||
name: Build/Publish
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
- develop
|
|
||||||
- develop-*
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
main:
|
|
||||||
uses: lumeweb/github-node-deploy-workflow/.github/workflows/main.yml@master
|
|
||||||
secrets: inherit
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
{
|
|
||||||
"preset": [
|
|
||||||
"@lumeweb/presetter-kernel-module-preset"
|
|
||||||
],
|
|
||||||
"config": {
|
|
||||||
"vite": {
|
|
||||||
"resolve": {
|
|
||||||
"alias": {
|
|
||||||
"timers": "timers-browserify",
|
|
||||||
"protomux": "@lumeweb/kernel-protomux-client"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"optimize": {
|
|
||||||
"node-fetch": "export default undefined;"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
74
CHANGELOG.md
74
CHANGELOG.md
|
|
@ -1,74 +0,0 @@
|
||||||
# [0.1.0-develop.12](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/compare/v0.1.0-develop.11...v0.1.0-develop.12) (2023-10-15)
|
|
||||||
|
|
||||||
# [0.1.0-develop.11](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/compare/v0.1.0-develop.10...v0.1.0-develop.11) (2023-10-12)
|
|
||||||
|
|
||||||
# [0.1.0-develop.10](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/compare/v0.1.0-develop.9...v0.1.0-develop.10) (2023-09-16)
|
|
||||||
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
* creating chainProgressListener event handler wrong ([e0d3a3d](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/commit/e0d3a3de8f687b560a18a5a52425547de0bed79e))
|
|
||||||
|
|
||||||
# [0.1.0-develop.9](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/compare/v0.1.0-develop.8...v0.1.0-develop.9) (2023-09-09)
|
|
||||||
|
|
||||||
# [0.1.0-develop.8](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/compare/v0.1.0-develop.7...v0.1.0-develop.8) (2023-09-02)
|
|
||||||
|
|
||||||
# [0.1.0-develop.7](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/compare/v0.1.0-develop.6...v0.1.0-develop.7) (2023-08-04)
|
|
||||||
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
* we need flag ad and rd on the dns query. rd is to request recursive lookup and ad is to ensure we only get DNSSEC responses ([67025f0](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/commit/67025f0f687fe566a3751e52d3cd11441dcd93a9))
|
|
||||||
* we need to override the tcp client on the NS icann resolver to pipe connections properly ([1a80319](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/commit/1a803193e6b6b18b1433360c2e26118ef8011094))
|
|
||||||
|
|
||||||
# [0.1.0-develop.6](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/compare/v0.1.0-develop.5...v0.1.0-develop.6) (2023-08-03)
|
|
||||||
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
* if the ad flag is not set (no dnssec) return an empty result for security ([cd571db](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/commit/cd571dbceb440be25e697c05d1186ed3675163a8))
|
|
||||||
|
|
||||||
# [0.1.0-develop.5](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/compare/v0.1.0-develop.4...v0.1.0-develop.5) (2023-08-02)
|
|
||||||
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
* add a patch for bns to export TCPSocket ([aaee3ac](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/commit/aaee3acb929089472ca82215cda0ebb39bb00780))
|
|
||||||
* add b4a patch ([e31973b](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/commit/e31973be7056efcacdfa32f82f068b3075bbe5cb))
|
|
||||||
|
|
||||||
# [0.1.0-develop.4](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/compare/v0.1.0-develop.3...v0.1.0-develop.4) (2023-08-02)
|
|
||||||
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
* use removeListener ([2eef509](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/commit/2eef5099c8277624e88b9a310aed14adf78e4b3f))
|
|
||||||
|
|
||||||
|
|
||||||
### Features
|
|
||||||
|
|
||||||
* add dns query api that uses mock sockets and a dedicated hyper proxy for DNS (port 53) requests ([d675a44](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/commit/d675a44b4e77a1c0aa2210f5bea3d538476f63ac))
|
|
||||||
|
|
||||||
# [0.1.0-develop.3](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/compare/v0.1.0-develop.2...v0.1.0-develop.3) (2023-07-29)
|
|
||||||
|
|
||||||
|
|
||||||
### Features
|
|
||||||
|
|
||||||
* add name api ([e612211](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/commit/e6122110c5e9d42773aeb57e0bfee2cee0e6febf))
|
|
||||||
|
|
||||||
# [0.1.0-develop.2](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/compare/v0.1.0-develop.1...v0.1.0-develop.2) (2023-07-23)
|
|
||||||
|
|
||||||
# [0.1.0-develop.1](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/compare/v0.0.2-develop.1...v0.1.0-develop.1) (2023-07-23)
|
|
||||||
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
* await swarm.join ([f08c87c](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/commit/f08c87c1845b7561c9aea1f7c21cf1f5528f92b7))
|
|
||||||
* need to override protomux with our kernel-protomux-client ([61050a5](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/commit/61050a5a054686c65a4e1e58035e39b6e37c25d6))
|
|
||||||
|
|
||||||
|
|
||||||
### Features
|
|
||||||
|
|
||||||
* add registry api for use with network registry ([f5ce851](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/commit/f5ce8518bb5261fbf25d5281c9f31ead99d735fd))
|
|
||||||
* add status api ([024c810](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/commit/024c810edf8a9f57693d89d44c785306d3edee89))
|
|
||||||
|
|
||||||
## [0.0.2-develop.1](https://git.lumeweb.com/LumeWeb/kernel-handshake-node/compare/v0.0.1...v0.0.2-develop.1) (2023-07-06)
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
import esbuild from "esbuild";
|
||||||
|
|
||||||
|
esbuild.buildSync({
|
||||||
|
entryPoints: ["src/index.ts"],
|
||||||
|
outfile: "dist/index.js",
|
||||||
|
format: "iife",
|
||||||
|
bundle: true,
|
||||||
|
legalComments: "external",
|
||||||
|
// minify: true
|
||||||
|
define: {
|
||||||
|
global: "self",
|
||||||
|
},
|
||||||
|
external: ['dns']
|
||||||
|
});
|
||||||
File diff suppressed because it is too large
Load Diff
80
package.json
80
package.json
|
|
@ -1,41 +1,65 @@
|
||||||
{
|
{
|
||||||
"name": "@lumeweb/kernel-handshake-node",
|
"name": "@lumeweb/kernel-handshake-node",
|
||||||
"types": "module",
|
"types": "module",
|
||||||
"repository": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "gitea@git.lumeweb.com:LumeWeb/kernel-handshake-node.git"
|
|
||||||
},
|
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Hammer Technologies LLC",
|
"name": "Hammer Technologies LLC",
|
||||||
"email": "contact@lumeweb.com"
|
"email": "contact@lumeweb.com"
|
||||||
},
|
},
|
||||||
"type": "module",
|
|
||||||
"version": "0.1.0-develop.12",
|
|
||||||
"readme": "ERROR: No README data found!",
|
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"prepare": "presetter bootstrap",
|
"test": "jest",
|
||||||
"build": "run build",
|
"format": "prettier -w src",
|
||||||
"semantic-release": "semantic-release",
|
"build-script": "tsc --project tsconfig.build.json && mv dist-build/build.js dist-build/build.mjs",
|
||||||
"postinstall": "patch-package"
|
"compile": "npm run build-script && tsc && rollup -c rollup.config.js",
|
||||||
|
"build": "npm run compile && node ./dist-build/build.mjs dev"
|
||||||
|
},
|
||||||
|
"type": "module",
|
||||||
|
"dependencies": {
|
||||||
|
"@lumeweb/kernel-swarm-client": "git+https://git.lumeweb.com/LumeWeb/kernel-swarm-client.git",
|
||||||
|
"@lumeweb/libhyperproxy": "git+https://git.lumeweb.com/LumeWeb/libhyperproxy.git",
|
||||||
|
"hsd": "github:handshake-org/hsd",
|
||||||
|
"libkmodule": "^0.2.53",
|
||||||
|
"p-defer": "^4.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@lumeweb/presetter-kernel-module-preset": "^0.1.0-develop.44",
|
|
||||||
"@types/streamx": "^2.9.1",
|
|
||||||
"patch-package": "^7.0.2",
|
|
||||||
"presetter": "*",
|
|
||||||
"timers-browserify": "^2.0.12",
|
|
||||||
"vite": "^4.4.0"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"@i2labs/dns": "^1.0.1",
|
"@i2labs/dns": "^1.0.1",
|
||||||
"@lumeweb/kernel-network-registry-client": "^0.1.0-develop.10",
|
"@rollup/plugin-alias": "^4.0.4",
|
||||||
"@lumeweb/kernel-protomux-client": "^0.0.2-develop.22",
|
"@rollup/plugin-commonjs": "^24.1.0",
|
||||||
"@lumeweb/kernel-swarm-client": "^0.1.0-develop.12",
|
"@rollup/plugin-inject": "^5.0.3",
|
||||||
"@lumeweb/libhyperproxy": "^0.0.2-develop.1",
|
"@rollup/plugin-json": "^6.0.0",
|
||||||
"@lumeweb/libkernel": "^0.1.0-develop.66",
|
"@rollup/plugin-node-resolve": "^15.0.2",
|
||||||
"assert": "^2.0.0",
|
"@rollup/plugin-typescript": "^11.1.0",
|
||||||
"hsd": "^6.1.0",
|
"@screamingvoid/sodium-universal": "^0.1.1",
|
||||||
"p-defer": "^4.0.0",
|
"@scure/bip39": "^1.2.0",
|
||||||
"streamx": "^2.15.0"
|
"@skynetlabs/skynet-nodejs": "^2.9.0",
|
||||||
|
"@types/node": "^18.15.11",
|
||||||
|
"@types/read": "^0.0.29",
|
||||||
|
"@types/streamx": "^2.9.1",
|
||||||
|
"cli-progress": "^3.12.0",
|
||||||
|
"esbuild": "^0.17.17",
|
||||||
|
"eventemitter3": "^5.0.0",
|
||||||
|
"node-stdlib-browser": "^1.2.0",
|
||||||
|
"os-browserify": "^0.3.0",
|
||||||
|
"path-browserify": "^1.0.1",
|
||||||
|
"prettier": "^2.8.7",
|
||||||
|
"read": "^2.1.0",
|
||||||
|
"rollup": "^3.20.3",
|
||||||
|
"rollup-plugin-polyfill": "^4.0.0",
|
||||||
|
"rollup-plugin-polyfill-inject": "^1.0.4",
|
||||||
|
"rollup-plugin-polyfill-node": "^0.12.0",
|
||||||
|
"setimmediate": "^1.0.5",
|
||||||
|
"tslib": "^2.5.0",
|
||||||
|
"typescript": "^4.9.5",
|
||||||
|
"util": "^0.12.5",
|
||||||
|
"vite": "^4.2.1",
|
||||||
|
"vite-plugin-node-polyfills": "^0.7.0",
|
||||||
|
"vite-plugin-node-stdlib-browser": "^0.1.1"
|
||||||
|
},
|
||||||
|
"pnpm": {
|
||||||
|
"overrides": {
|
||||||
|
"protomux": "git+https://git.lumeweb.com/LumeWeb/kernel-protomux-client.git"
|
||||||
|
},
|
||||||
|
"patchedDependencies": {
|
||||||
|
"b4a@1.6.3": "patches/b4a@1.6.3.patch"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
diff --git a/node_modules/b4a/package.json b/node_modules/b4a/package.json
|
|
||||||
index fed0957..a4b08a5 100644
|
|
||||||
--- a/node_modules/b4a/package.json
|
|
||||||
+++ b/node_modules/b4a/package.json
|
|
||||||
@@ -8,9 +8,6 @@
|
|
||||||
"index.js",
|
|
||||||
"lib"
|
|
||||||
],
|
|
||||||
- "browser": {
|
|
||||||
- "./index.js": "./browser.js"
|
|
||||||
- },
|
|
||||||
"scripts": {
|
|
||||||
"test": "standard && brittle test/*.mjs"
|
|
||||||
},
|
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
diff --git a/browser.js b/browser.js
|
||||||
|
index e07f78d17b7b4a2963e4f0062047cc96e6025f9e..a9f266a2644f3f8ebd0f6684b3e11a7519059851 100644
|
||||||
|
--- a/browser.js
|
||||||
|
+++ b/browser.js
|
||||||
|
@@ -3,6 +3,7 @@ const base64 = require('./lib/base64')
|
||||||
|
const hex = require('./lib/hex')
|
||||||
|
const utf8 = require('./lib/utf8')
|
||||||
|
const utf16le = require('./lib/utf16le')
|
||||||
|
+const Buffer = require('buffer').Buffer
|
||||||
|
|
||||||
|
const LE = new Uint8Array(Uint16Array.of(0xff).buffer)[0] === 0xff
|
||||||
|
|
||||||
|
diff --git a/index.js b/index.js
|
||||||
|
index a751d6b4d27c7dd903efbfdc87a98f61044a62b8..8bd32640afdcfbc475168d458c51f8b9162d1656 100644
|
||||||
|
--- a/index.js
|
||||||
|
+++ b/index.js
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+const Buffer = require('buffer').Buffer
|
||||||
|
+
|
||||||
|
function isBuffer (value) {
|
||||||
|
return Buffer.isBuffer(value) || value instanceof Uint8Array
|
||||||
|
}
|
||||||
|
diff --git a/package.json b/package.json
|
||||||
|
index eb0f792709b27e66f26658054781b4099507b5ed..69c4ff39c48b0bdd5f0bc7ebbade517e7c5d76e4 100644
|
||||||
|
--- a/package.json
|
||||||
|
+++ b/package.json
|
||||||
|
@@ -8,9 +8,6 @@
|
||||||
|
"index.js",
|
||||||
|
"lib"
|
||||||
|
],
|
||||||
|
- "browser": {
|
||||||
|
- "./index.js": "./browser.js"
|
||||||
|
- },
|
||||||
|
"scripts": {
|
||||||
|
"test": "standard && brittle test/*.mjs"
|
||||||
|
},
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
diff --git a/node_modules/bns/lib/internal/net.js b/node_modules/bns/lib/internal/net.js
|
|
||||||
index 4ad5ee0..beaf186 100644
|
|
||||||
--- a/node_modules/bns/lib/internal/net.js
|
|
||||||
+++ b/node_modules/bns/lib/internal/net.js
|
|
||||||
@@ -646,3 +646,4 @@ function normalize(options) {
|
|
||||||
|
|
||||||
exports.Client = Client;
|
|
||||||
exports.Server = Server;
|
|
||||||
+exports.TCPSocket = TCPSocket;
|
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
import resolve from "@rollup/plugin-node-resolve";
|
||||||
|
import commonjs from "@rollup/plugin-commonjs";
|
||||||
|
import json from "@rollup/plugin-json";
|
||||||
|
import stdLibBrowser from "node-stdlib-browser";
|
||||||
|
import { handleCircularDependancyWarning } from "node-stdlib-browser/helpers/rollup/plugin";
|
||||||
|
import alias from "@rollup/plugin-alias";
|
||||||
|
import inject from "@rollup/plugin-inject";
|
||||||
|
import { defineConfig } from "rollup";
|
||||||
|
import * as fs from "fs";
|
||||||
|
import path from "path";
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
input: "build/index.js",
|
||||||
|
output: {
|
||||||
|
file: "dist/index.js",
|
||||||
|
format: "iife",
|
||||||
|
inlineDynamicImports: true,
|
||||||
|
banner: fs.readFileSync(
|
||||||
|
path.resolve("node_modules/setimmediate/setImmediate.js")
|
||||||
|
),
|
||||||
|
},
|
||||||
|
plugins: [
|
||||||
|
json(),
|
||||||
|
alias({
|
||||||
|
entries: stdLibBrowser,
|
||||||
|
}),
|
||||||
|
resolve({ browser: true, preferBuiltins: true, dedupe: ["libkmodule"] }),
|
||||||
|
commonjs({ transformMixedEsModules: true }),
|
||||||
|
inject({
|
||||||
|
process: stdLibBrowser.process,
|
||||||
|
Buffer: [stdLibBrowser.buffer, "Buffer"],
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
onwarn: (warning, rollupWarn) => {
|
||||||
|
handleCircularDependancyWarning(warning, rollupWarn);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,218 @@
|
||||||
|
// This is the standard build script for a kernel module.
|
||||||
|
|
||||||
|
import * as fs from "fs";
|
||||||
|
import read from "read";
|
||||||
|
import * as bip39 from "@scure/bip39";
|
||||||
|
import { wordlist } from "@scure/bip39/wordlists/english.js";
|
||||||
|
//@ts-ignore
|
||||||
|
import { SkynetClient } from "@skynetlabs/skynet-nodejs";
|
||||||
|
|
||||||
|
// Helper variables to make it easier to return empty values alongside errors.
|
||||||
|
const nu8 = new Uint8Array(0);
|
||||||
|
const nkp = {
|
||||||
|
publicKey: nu8,
|
||||||
|
secretKey: nu8,
|
||||||
|
};
|
||||||
|
|
||||||
|
// readFile is a wrapper for fs.readFileSync that handles the try-catch for the
|
||||||
|
// caller.
|
||||||
|
function readFile(fileName: string): [string, string | null] {
|
||||||
|
try {
|
||||||
|
let data = fs.readFileSync(fileName, "utf8");
|
||||||
|
return [data, null];
|
||||||
|
} catch (err) {
|
||||||
|
return ["", "unable to read file: " + JSON.stringify(err)];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// readFileBinary is a wrapper for fs.readFileSync that handles the try-catch
|
||||||
|
// for the caller.
|
||||||
|
function readFileBinary(fileName: string): [Uint8Array, string | null] {
|
||||||
|
try {
|
||||||
|
let data = fs.readFileSync(fileName, null);
|
||||||
|
return [data, null];
|
||||||
|
} catch (err) {
|
||||||
|
return [nu8, "unable to read file: " + JSON.stringify(err)];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// writeFile is a wrapper for fs.writeFileSync which handles the try-catch in a
|
||||||
|
// non-exception way.
|
||||||
|
function writeFile(fileName: string, fileData: string): string | null {
|
||||||
|
try {
|
||||||
|
fs.writeFileSync(fileName, fileData);
|
||||||
|
return null;
|
||||||
|
} catch (err) {
|
||||||
|
return "unable to write file: " + JSON.stringify(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// handlePass handles all portions of the script that occur after the password
|
||||||
|
// has been requested. If no password needs to be requested, handlePass will be
|
||||||
|
// called with a null input. We need to structure the code this way because the
|
||||||
|
// password reader is async and we can only access the password when using a
|
||||||
|
// callback.
|
||||||
|
function handlePass(password: string) {
|
||||||
|
try {
|
||||||
|
// If we are running prod and the seed file does not exist, we
|
||||||
|
// need to confirm the password and also warn the user to use a
|
||||||
|
// secure password.
|
||||||
|
if (!fs.existsSync(seedFile) && process.argv[2] === "prod") {
|
||||||
|
// The file does not exist, we need to confirm the
|
||||||
|
// password.
|
||||||
|
console.log();
|
||||||
|
console.log(
|
||||||
|
"No production entry found for module. Creating new production module..."
|
||||||
|
);
|
||||||
|
console.log(
|
||||||
|
"If someone can guess the password, they can push arbitrary changes to your module."
|
||||||
|
);
|
||||||
|
console.log("Please use a secure password.");
|
||||||
|
console.log();
|
||||||
|
read(
|
||||||
|
{ prompt: "Confirm Password: ", silent: true },
|
||||||
|
function (err: any, confirmPassword: string) {
|
||||||
|
if (err) {
|
||||||
|
console.error("unable to fetch password:", err);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
if (password !== confirmPassword) {
|
||||||
|
console.error("passwords do not match");
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
handlePassConfirm(moduleSalt, password);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// If the seed file does exist, or if we are using dev,
|
||||||
|
// there's no need to confirm the password but we do
|
||||||
|
// need to pass the logic off to the handlePassConfirm
|
||||||
|
// callback.
|
||||||
|
handlePassConfirm(moduleSalt, password);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Unable to read seedFile:", err);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// handlePassConfirm handles the full script after the confirmation password
|
||||||
|
// has been provided. If not confirmation password is needed, this function
|
||||||
|
// will be called anyway using the unconfirmed password as input.
|
||||||
|
function handlePassConfirm(seed: string, password: string) {
|
||||||
|
// Create the seedFile if it does not exist. For dev we just save the
|
||||||
|
// seed to disk outright, because this is a dev build and therefore not
|
||||||
|
// security sensitive. Also the dev seed does not get pushed to the
|
||||||
|
// github repo.
|
||||||
|
//
|
||||||
|
// For prod, we use the seed to create a new seed (called the shield)
|
||||||
|
// which allows us to verify that the developer has provided the right
|
||||||
|
// password when deploying the module. The shield does get pushed to
|
||||||
|
// the github repo so that the production module is the same on all
|
||||||
|
// devices.
|
||||||
|
if (!fs.existsSync(seedFile) && process.argv[2] !== "prod") {
|
||||||
|
// Generate the seed phrase and write it to the file.
|
||||||
|
let seedPhrase = bip39.generateMnemonic(wordlist);
|
||||||
|
let errWF = writeFile(seedFile, seedPhrase);
|
||||||
|
if (errWF !== null) {
|
||||||
|
console.error("unable to write file:", errWF);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
} else if (!fs.existsSync(seedFile) && process.argv[2] === "prod") {
|
||||||
|
// Generate the seed phrase.
|
||||||
|
let seedPhrase = bip39.generateMnemonic(wordlist);
|
||||||
|
// Write the registry link to the file.
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load or verify the seed. If this is prod, the password is used to
|
||||||
|
// create and verify the seed. If this is dev, we just load the seed
|
||||||
|
// with no password.
|
||||||
|
let seedPhrase: string;
|
||||||
|
let registryLink: string;
|
||||||
|
if (process.argv[2] === "prod") {
|
||||||
|
// Generate the seed phrase from the password.
|
||||||
|
seedPhrase = bip39.generateMnemonic(wordlist);
|
||||||
|
} else {
|
||||||
|
let [sp, errRF] = readFile(seedFile);
|
||||||
|
if (errRF !== null) {
|
||||||
|
console.error("unable to read seed phrase for dev command from disk");
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
seedPhrase = sp;
|
||||||
|
}
|
||||||
|
|
||||||
|
let metadata = {
|
||||||
|
Filename: "index.js",
|
||||||
|
};
|
||||||
|
const client = new SkynetClient("https://web3portal.com");
|
||||||
|
client
|
||||||
|
.uploadFile("dist/index.js")
|
||||||
|
.then((result: any) => {
|
||||||
|
console.log("Immutable Link for kernel:", result);
|
||||||
|
})
|
||||||
|
.catch((err: any) => {
|
||||||
|
console.error("unable to upload file", err);
|
||||||
|
process.exit(1);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add a newline for readability.
|
||||||
|
console.log();
|
||||||
|
|
||||||
|
// Check for a 'dev' or 'prod' input to the script.
|
||||||
|
if (process.argv.length !== 3) {
|
||||||
|
console.error("need to provide either 'dev' or 'prod' as an input");
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create the build folder if it does not exist.
|
||||||
|
if (!fs.existsSync("build")) {
|
||||||
|
fs.mkdirSync("build");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine the seed file.
|
||||||
|
let seedFile: string;
|
||||||
|
if (process.argv[2] === "prod") {
|
||||||
|
seedFile = "module-skylink";
|
||||||
|
} else if (process.argv[2] === "dev") {
|
||||||
|
seedFile = "build/dev-seed";
|
||||||
|
} else {
|
||||||
|
console.error("need to provide either 'dev' or 'prod' as an input");
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// If doing a prod deployment, check whether the salt file exists. If it does
|
||||||
|
// not, create it.
|
||||||
|
let moduleSalt: string;
|
||||||
|
if (!fs.existsSync(".module-salt")) {
|
||||||
|
moduleSalt = bip39.generateMnemonic(wordlist);
|
||||||
|
let errWF = writeFile(".module-salt", moduleSalt);
|
||||||
|
if (errWF !== null) {
|
||||||
|
console.error("unable to write module salt file:", errWF);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
let [ms, errRF] = readFile(".module-salt");
|
||||||
|
if (errRF !== null) {
|
||||||
|
console.error("unable to read moduleSalt");
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
ms = ms.replace(/\n$/, "");
|
||||||
|
moduleSalt = ms;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Need to get a password if this is a prod build.
|
||||||
|
if (process.argv[2] === "prod") {
|
||||||
|
read(
|
||||||
|
{ prompt: "Password: ", silent: true },
|
||||||
|
function (err: any, password: string) {
|
||||||
|
if (err) {
|
||||||
|
console.error("unable to fetch password:", err);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
handlePass(password);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
handlePass("");
|
||||||
|
}
|
||||||
|
|
@ -1,132 +0,0 @@
|
||||||
import { Client as Base, TCPSocket } from "bns/lib/internal/net.js";
|
|
||||||
import IP from "binet";
|
|
||||||
import { Duplex } from "streamx";
|
|
||||||
import { MultiSocketProxy } from "@lumeweb/libhyperproxy";
|
|
||||||
import defer from "p-defer";
|
|
||||||
|
|
||||||
class Stream extends Duplex {
|
|
||||||
public remoteAddress = "127.0.0.1";
|
|
||||||
public family = "IPv4";
|
|
||||||
public port = 0;
|
|
||||||
public remotePort = 0;
|
|
||||||
public parent: any;
|
|
||||||
|
|
||||||
constructor(options) {
|
|
||||||
super(options);
|
|
||||||
this.parent = options.parent;
|
|
||||||
}
|
|
||||||
|
|
||||||
setNoDelay() {}
|
|
||||||
|
|
||||||
connect() {
|
|
||||||
setTimeout(() => {
|
|
||||||
// @ts-ignore
|
|
||||||
this.emit("connect");
|
|
||||||
}, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
unref() {}
|
|
||||||
}
|
|
||||||
|
|
||||||
const PROTOCOL = "lumeweb.proxy.handshake.dns";
|
|
||||||
|
|
||||||
export default class TCPClient extends Base {
|
|
||||||
private node: any;
|
|
||||||
private proxy: MultiSocketProxy;
|
|
||||||
private peerConnected = defer();
|
|
||||||
|
|
||||||
constructor(options) {
|
|
||||||
super(options);
|
|
||||||
|
|
||||||
this.node = options.node;
|
|
||||||
this.proxy = new MultiSocketProxy({
|
|
||||||
protocol: PROTOCOL,
|
|
||||||
swarm: options.swarm,
|
|
||||||
server: false,
|
|
||||||
autostart: true,
|
|
||||||
listen: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
this.proxy.on("peerChannelOpen", () => {
|
|
||||||
this.peerConnected.resolve();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
protected declare sockets: Map<any, any>;
|
|
||||||
|
|
||||||
async write(msg, port, host) {
|
|
||||||
const local = host === "127.0.0.1";
|
|
||||||
const key = IP.toHost(host, port);
|
|
||||||
const cache = this.sockets.get(key);
|
|
||||||
|
|
||||||
if (cache) {
|
|
||||||
cache.write(msg);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let socket: any = null;
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (local) {
|
|
||||||
socket = await this.createLocalSocket();
|
|
||||||
} else {
|
|
||||||
await this.peerConnected.promise;
|
|
||||||
socket = new TCPSocket(this);
|
|
||||||
socket.socket = this.proxy.createSocket({
|
|
||||||
host,
|
|
||||||
port,
|
|
||||||
});
|
|
||||||
socket.socket.remoteAddress = host;
|
|
||||||
socket.socket.remotePort = port;
|
|
||||||
|
|
||||||
await socket.connect();
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.sockets.has(key)) {
|
|
||||||
socket.destroy();
|
|
||||||
socket = this.sockets.get(key);
|
|
||||||
} else {
|
|
||||||
socket.parent = this;
|
|
||||||
this.sockets.set(key, socket);
|
|
||||||
}
|
|
||||||
|
|
||||||
socket.write(msg);
|
|
||||||
}
|
|
||||||
|
|
||||||
async createLocalSocket() {
|
|
||||||
const socket = new TCPSocket(this);
|
|
||||||
const remoteSocket = new Stream({
|
|
||||||
parent: this,
|
|
||||||
write: (data, cb) => {
|
|
||||||
// @ts-ignore
|
|
||||||
socket.socket.push(data);
|
|
||||||
cb?.(null);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
// @ts-ignore
|
|
||||||
socket.socket = new Stream({
|
|
||||||
parent: this,
|
|
||||||
write: (data, cb) => {
|
|
||||||
// @ts-ignore
|
|
||||||
remoteSocket.push(data);
|
|
||||||
cb?.(null);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const port = this.node.rs.hns.getAuthority().servers.slice().pop().port;
|
|
||||||
remoteSocket.port = port;
|
|
||||||
remoteSocket.remotePort = port;
|
|
||||||
// @ts-ignore
|
|
||||||
socket.socket.port = port;
|
|
||||||
// @ts-ignore
|
|
||||||
socket.socket.remotePort = port;
|
|
||||||
|
|
||||||
await socket.connect();
|
|
||||||
|
|
||||||
this.node.ns.server.server.emit("connection", remoteSocket);
|
|
||||||
|
|
||||||
return socket;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
120
src/index.ts
120
src/index.ts
|
|
@ -1,7 +1,6 @@
|
||||||
import type { ActiveQuery } from "@lumeweb/libkernel/module";
|
import type { ActiveQuery } from "libkmodule";
|
||||||
import { addHandler, handleMessage } from "@lumeweb/libkernel/module";
|
import { addHandler, handleMessage } from "libkmodule";
|
||||||
import { createClient as createSwarmClient } from "@lumeweb/kernel-swarm-client";
|
import { createClient } from "@lumeweb/kernel-swarm-client";
|
||||||
import { createClient as createNetworkRegistryClient } from "@lumeweb/kernel-network-registry-client";
|
|
||||||
import {
|
import {
|
||||||
createServer,
|
createServer,
|
||||||
DummySocket,
|
DummySocket,
|
||||||
|
|
@ -12,11 +11,8 @@ import { SPVNode } from "hsd/lib/node";
|
||||||
import defer from "p-defer";
|
import defer from "p-defer";
|
||||||
import dns from "@i2labs/dns";
|
import dns from "@i2labs/dns";
|
||||||
import assert from "assert";
|
import assert from "assert";
|
||||||
import { wire } from "bns";
|
|
||||||
import TCPClient from "./dns/tcpClient.js";
|
|
||||||
|
|
||||||
const PROTOCOL = "lumeweb.proxy.handshake";
|
const PROTOCOL = "lumeweb.proxy.handshake";
|
||||||
const TYPES = ["blockchain"];
|
|
||||||
|
|
||||||
onmessage = handleMessage;
|
onmessage = handleMessage;
|
||||||
|
|
||||||
|
|
@ -25,20 +21,14 @@ let moduleLoaded: Promise<void> = new Promise((resolve) => {
|
||||||
moduleLoadedResolve = resolve;
|
moduleLoadedResolve = resolve;
|
||||||
});
|
});
|
||||||
|
|
||||||
addHandler("presentKey", handlePresentKey);
|
addHandler("presentSeed", handlePresentSeed);
|
||||||
addHandler("register", handleRegister);
|
|
||||||
addHandler("status", handleStatus, { receiveUpdates: true });
|
|
||||||
addHandler("name", handleName);
|
|
||||||
addHandler("ready", handleReady);
|
addHandler("ready", handleReady);
|
||||||
addHandler("query", handleQuery);
|
addHandler("query", handleQuery);
|
||||||
addHandler("dnsQuery", handleDnsQuery);
|
|
||||||
|
|
||||||
let swarm;
|
let swarm;
|
||||||
let proxy: MultiSocketProxy;
|
let proxy: MultiSocketProxy;
|
||||||
let node: SPVNode;
|
let node: SPVNode;
|
||||||
|
|
||||||
const networkRegistry = createNetworkRegistryClient();
|
|
||||||
|
|
||||||
function resolveWithPeers(resolve: Function) {
|
function resolveWithPeers(resolve: Function) {
|
||||||
if (!node.pool.peers.head()) {
|
if (!node.pool.peers.head()) {
|
||||||
node.pool.on("peer", () => {
|
node.pool.on("peer", () => {
|
||||||
|
|
@ -70,14 +60,15 @@ function resolveWithPeers(resolve: Function) {
|
||||||
return resolve(null);
|
return resolve(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handlePresentKey(aq: ActiveQuery) {
|
async function handlePresentSeed(aq: ActiveQuery) {
|
||||||
swarm = createSwarmClient();
|
swarm = createClient();
|
||||||
|
|
||||||
const peerConnected = defer();
|
const peerConnected = defer();
|
||||||
node = new SPVNode({
|
node = new SPVNode({
|
||||||
config: false,
|
config: false,
|
||||||
argv: false,
|
argv: false,
|
||||||
env: false,
|
env: false,
|
||||||
|
noDns: true,
|
||||||
memory: false,
|
memory: false,
|
||||||
logFile: false,
|
logFile: false,
|
||||||
logConsole: true,
|
logConsole: true,
|
||||||
|
|
@ -116,8 +107,8 @@ async function handlePresentKey(aq: ActiveQuery) {
|
||||||
"208.67.220.222",
|
"208.67.220.222",
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const out: string[] = [];
|
const out = [];
|
||||||
const types: string[] = [];
|
const types = [];
|
||||||
|
|
||||||
if (family == null || family === 4) types.push("A");
|
if (family == null || family === 4) types.push("A");
|
||||||
|
|
||||||
|
|
@ -145,15 +136,6 @@ async function handlePresentKey(aq: ActiveQuery) {
|
||||||
node.http.http.listen = (port: number, host: string, cb: Function) => cb();
|
node.http.http.listen = (port: number, host: string, cb: Function) => cb();
|
||||||
}
|
}
|
||||||
|
|
||||||
const tcpClient = new TCPClient({ node, swarm });
|
|
||||||
|
|
||||||
node.rs.hns.forceTCP = true;
|
|
||||||
node.rs.hns.socket = tcpClient;
|
|
||||||
node.ns.icann.forceTCP = true;
|
|
||||||
node.ns.icann.socket = tcpClient;
|
|
||||||
node.rs.hns.init();
|
|
||||||
node.ns.icann.init();
|
|
||||||
|
|
||||||
proxy = new MultiSocketProxy({
|
proxy = new MultiSocketProxy({
|
||||||
protocol: PROTOCOL,
|
protocol: PROTOCOL,
|
||||||
swarm,
|
swarm,
|
||||||
|
|
@ -166,7 +148,7 @@ async function handlePresentKey(aq: ActiveQuery) {
|
||||||
peerConnected.resolve();
|
peerConnected.resolve();
|
||||||
});
|
});
|
||||||
|
|
||||||
await swarm.join(PROTOCOL);
|
swarm.join(PROTOCOL);
|
||||||
await swarm.start();
|
await swarm.start();
|
||||||
|
|
||||||
await peerConnected.promise;
|
await peerConnected.promise;
|
||||||
|
|
@ -206,85 +188,3 @@ async function handleQuery(aq: ActiveQuery) {
|
||||||
aq.reject((e as Error).message);
|
aq.reject((e as Error).message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleDnsQuery(aq: ActiveQuery) {
|
|
||||||
if (!node.chain.synced || !node.pool.peers.head()) {
|
|
||||||
aq.reject("not ready");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!("fqdn" in aq.callerInput)) {
|
|
||||||
aq.reject("fqdn required");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!("type" in aq.callerInput)) {
|
|
||||||
aq.reject("type required");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const msg = new wire.Message();
|
|
||||||
const q = new wire.Question(aq.callerInput.fqdn, aq.callerInput.type);
|
|
||||||
|
|
||||||
msg.question.push(q);
|
|
||||||
|
|
||||||
msg.rd = true;
|
|
||||||
msg.ad = true;
|
|
||||||
|
|
||||||
const ret = await node.rs.answer(msg);
|
|
||||||
|
|
||||||
if (!ret.ad) {
|
|
||||||
aq.respond([]);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
aq.respond(
|
|
||||||
ret.collect(aq.callerInput.fqdn, wire.stringToType(aq.callerInput.type)),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handleRegister(aq: ActiveQuery) {
|
|
||||||
await networkRegistry.registerNetwork(TYPES);
|
|
||||||
|
|
||||||
aq.respond();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handleStatus(aq: ActiveQuery) {
|
|
||||||
let chainProgress = node.chain.getProgress();
|
|
||||||
let chainPeers = node.pool.peers.size();
|
|
||||||
|
|
||||||
const chainProgressListener = () => {
|
|
||||||
chainProgress = node.chain.getProgress();
|
|
||||||
sendUpdate();
|
|
||||||
};
|
|
||||||
|
|
||||||
function peersListener() {
|
|
||||||
chainPeers = node.pool.peers.size();
|
|
||||||
sendUpdate();
|
|
||||||
}
|
|
||||||
|
|
||||||
node.pool.on("peer", peersListener);
|
|
||||||
node.pool.on("peer close", peersListener);
|
|
||||||
node.chain.on("tip", chainProgressListener);
|
|
||||||
|
|
||||||
function sendUpdate() {
|
|
||||||
aq.sendUpdate({
|
|
||||||
sync: chainProgress * 100,
|
|
||||||
peers: chainPeers,
|
|
||||||
ready: node.chain.synced,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
aq.setReceiveUpdate?.(() => {
|
|
||||||
node.chain.removeListener("tip", chainProgressListener);
|
|
||||||
node.pool.off("peer", peersListener);
|
|
||||||
node.pool.off("peer close", peersListener);
|
|
||||||
aq.respond();
|
|
||||||
});
|
|
||||||
|
|
||||||
sendUpdate();
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleName(aq: ActiveQuery) {
|
|
||||||
aq.respond("Handshake");
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"target": "esnext",
|
||||||
|
"module": "esnext",
|
||||||
|
"moduleResolution": "node",
|
||||||
|
"allowSyntheticDefaultImports": true,
|
||||||
|
"declaration": true,
|
||||||
|
"outDir": "./dist-build",
|
||||||
|
"strict": true,
|
||||||
|
"esModuleInterop": true
|
||||||
|
},
|
||||||
|
"include": ["src-build"],
|
||||||
|
"exclude": ["node_modules", "**/__tests__/*"]
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"target": "esnext",
|
||||||
|
"declaration": true,
|
||||||
|
"moduleResolution": "node",
|
||||||
|
"outDir": "./build",
|
||||||
|
"strict": true,
|
||||||
|
"allowSyntheticDefaultImports": true
|
||||||
|
},
|
||||||
|
"include": ["src"],
|
||||||
|
"exclude": ["node_modules", "**/__tests__/*"]
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue