From 243f350a54d0e1f569ae1422c5040d98cc27ee9b Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Wed, 21 Sep 2022 08:59:22 -0400 Subject: [PATCH] *re-structure code --- src/config.ts | 2 +- src/index.ts | 12 ++++++------ src/{ => lib}/error.ts | 0 src/{ => lib}/file.ts | 0 src/{ => lib}/util.ts | 2 +- src/{ => modules}/app.ts | 0 src/{ => modules}/dht.ts | 4 ++-- src/{ => modules}/dns.ts | 2 +- src/{ => modules}/plugin.ts | 8 ++++---- src/{ => modules}/relay.ts | 2 +- src/{ => modules}/rpc.ts | 6 +++--- src/{ => modules}/ssl.ts | 6 +++--- src/rpc/server.ts | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) rename src/{ => lib}/error.ts (100%) rename src/{ => lib}/file.ts (100%) rename src/{ => lib}/util.ts (91%) rename src/{ => modules}/app.ts (100%) rename src/{ => modules}/dht.ts (92%) rename src/{ => modules}/dns.ts (97%) rename src/{ => modules}/plugin.ts (95%) rename src/{ => modules}/relay.ts (98%) rename src/{ => modules}/rpc.ts (73%) rename src/{ => modules}/ssl.ts (97%) diff --git a/src/config.ts b/src/config.ts index 503814d..687c7d9 100644 --- a/src/config.ts +++ b/src/config.ts @@ -6,7 +6,7 @@ import BConfig from "bcfg"; import * as os from "os"; import path from "path"; -import { errorExit } from "./error.js"; +import { errorExit } from "./lib/error.js"; const config = new BConfig("lumeweb-relay"); diff --git a/src/index.ts b/src/index.ts index b655103..2bb75e3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,11 +1,11 @@ -import { start as startRpc } from "./rpc.js"; -import { start as startRelay } from "./relay.js"; -import { start as startApp } from "./app"; +import { start as startRpc } from "./modules/rpc.js"; +import { start as startRelay } from "./modules/relay.js"; +import { start as startApp } from "./modules/app"; import log from "loglevel"; import config from "./config.js"; -import { loadPlugins } from "./plugin.js"; -import { start as startDns } from "./dns.js"; -import { start as startSSl } from "./ssl.js"; +import { loadPlugins } from "./modules/plugin.js"; +import { start as startDns } from "./modules/dns.js"; +import { start as startSSl } from "./modules/ssl.js"; log.setDefaultLevel(config.str("log-level")); diff --git a/src/error.ts b/src/lib/error.ts similarity index 100% rename from src/error.ts rename to src/lib/error.ts diff --git a/src/file.ts b/src/lib/file.ts similarity index 100% rename from src/file.ts rename to src/lib/file.ts diff --git a/src/util.ts b/src/lib/util.ts similarity index 91% rename from src/util.ts rename to src/lib/util.ts index 49899a5..ab9caed 100644 --- a/src/util.ts +++ b/src/lib/util.ts @@ -1,4 +1,4 @@ -import config from "./config"; +import config from "../config"; import { seedPhraseToSeed } from "libskynet"; export function dynImport(module: string) { diff --git a/src/app.ts b/src/modules/app.ts similarity index 100% rename from src/app.ts rename to src/modules/app.ts diff --git a/src/dht.ts b/src/modules/dht.ts similarity index 92% rename from src/dht.ts rename to src/modules/dht.ts index 707c800..3da758f 100644 --- a/src/dht.ts +++ b/src/modules/dht.ts @@ -3,8 +3,8 @@ // @ts-ignore import DHT from "@hyperswarm/dht"; -import config from "./config.js"; -import { errorExit } from "./error.js"; +import config from "../config.js"; +import { errorExit } from "../lib/error.js"; import { deriveMyskyRootKeypair, seedPhraseToSeed, diff --git a/src/dns.ts b/src/modules/dns.ts similarity index 97% rename from src/dns.ts rename to src/modules/dns.ts index 0380e6d..4c57438 100644 --- a/src/dns.ts +++ b/src/modules/dns.ts @@ -2,7 +2,7 @@ import cron from "node-cron"; import { get as getDHT } from "./dht.js"; import { Buffer } from "buffer"; import { pack } from "msgpackr"; -import config from "./config.js"; +import config from "../config.js"; import log from "loglevel"; import fetch from "node-fetch"; import { overwriteRegistryEntry } from "libskynetnode"; diff --git a/src/plugin.ts b/src/modules/plugin.ts similarity index 95% rename from src/plugin.ts rename to src/modules/plugin.ts index dfe2884..15f4819 100644 --- a/src/plugin.ts +++ b/src/modules/plugin.ts @@ -1,5 +1,5 @@ -import config from "./config.js"; -import { getRpcServer } from "./rpc/server.js"; +import config from "../config.js"; +import { getRpcServer } from "../rpc/server.js"; import type { PluginAPI, RPCMethod, Plugin } from "@lumeweb/relay-types"; import slugify from "slugify"; import * as fs from "fs"; @@ -14,13 +14,13 @@ import { setSslContext, } from "./ssl.js"; import log from "loglevel"; -import { getSeed } from "./util.js"; +import { getSeed } from "../lib/util.js"; import { getRouter, resetRouter, setRouter } from "./app.js"; import { createIndependentFileSmall, openIndependentFileSmall, overwriteIndependentFileSmall, -} from "./file"; +} from "../lib/file"; import { setDnsProvider } from "./dns"; let pluginApi: PluginApiManager; diff --git a/src/relay.ts b/src/modules/relay.ts similarity index 98% rename from src/relay.ts rename to src/modules/relay.ts index 60b928e..b07fae0 100644 --- a/src/relay.ts +++ b/src/modules/relay.ts @@ -5,7 +5,7 @@ import { relay } from "@hyperswarm/dht-relay"; // @ts-ignore import Stream from "@hyperswarm/dht-relay/ws"; import express, { Express } from "express"; -import config from "./config.js"; +import config from "../config.js"; import * as http from "http"; import * as https from "https"; import { get as getDHT } from "./dht.js"; diff --git a/src/rpc.ts b/src/modules/rpc.ts similarity index 73% rename from src/rpc.ts rename to src/modules/rpc.ts index eeb3811..59d3b1f 100644 --- a/src/rpc.ts +++ b/src/modules/rpc.ts @@ -1,11 +1,11 @@ //const require = createRequire(import.meta.url); //import { createRequire } from "module"; -import config from "./config.js"; -import { errorExit } from "./error.js"; +import config from "../config.js"; +import { errorExit } from "../lib/error.js"; // @ts-ignore import stringify from "json-stable-stringify"; -import { getRpcServer } from "./rpc/server.js"; +import { getRpcServer } from "../rpc/server.js"; export async function start() { if (!config.str("pocket-app-id") || !config.str("pocket-app-key")) { diff --git a/src/ssl.ts b/src/modules/ssl.ts similarity index 97% rename from src/ssl.ts rename to src/modules/ssl.ts index 264be47..c50a975 100644 --- a/src/ssl.ts +++ b/src/modules/ssl.ts @@ -3,12 +3,12 @@ import { createIndependentFileSmall, openIndependentFileSmall, overwriteIndependentFileSmall, -} from "./file.js"; +} from "../lib/file.js"; // @ts-ignore import promiseRetry from "promise-retry"; -import config from "./config.js"; +import config from "../config.js"; import log from "loglevel"; -import { getSeed } from "./util.js"; +import { getSeed } from "../lib/util.js"; import type { IndependentFileSmall, SavedSslData, diff --git a/src/rpc/server.ts b/src/rpc/server.ts index 2e15700..8f71adc 100644 --- a/src/rpc/server.ts +++ b/src/rpc/server.ts @@ -5,7 +5,7 @@ import { RPCStreamHandler, } from "@lumeweb/relay-types"; import NodeCache from "node-cache"; -import { get as getDHT } from "../dht.js"; +import { get as getDHT } from "../modules/dht.js"; import { Mutex } from "async-mutex"; import crypto from "crypto";