From 4f9404faa52d292d2ed7c1266fd73d99773548c2 Mon Sep 17 00:00:00 2001 From: Pablo Fernandez Date: Sat, 9 Dec 2023 23:59:08 +0000 Subject: [PATCH] license stuff --- package.json | 12 ++++++------ pnpm-lock.yaml | 48 ++++++++++++++++++++++++------------------------ src/client.ts | 2 +- src/index.ts | 6 ------ 4 files changed, 31 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index 21a9126..66c6591 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "nsecbunkerd", - "version": "0.8.0", + "version": "0.8.1", "description": "nsecbunker daemon", "main": "dist/index.js", "bin": { "nsecbunkerd": "dist/index.js", - "nsecbunker-client": "dist/client.js" + "nsecbunker-client": "dist/client/client.js" }, "files": [ "dist", @@ -19,26 +19,26 @@ "url": "https://github.com/kind-0/nsecbunkerd" }, "scripts": { - "build": "tsup src/index.ts; tsup src/daemon/index.ts -d dist/daemon", + "build": "tsup src/index.ts; tsup src/daemon/index.ts -d dist/daemon; tsup src/client.ts -d dist/client", "prisma:generate": "npx prisma generate", "prisma:migrate": "npx prisma migrate deploy", "prisma:create": "npx prisma db push --preview-feature", "start": "node ./scripts/start.js", "lfg": "node ./scripts/start.js start", "nsecbunkerd": "node dist/index.js", - "nsecbunker-client": "node dist/client.js" + "client": "node dist/client/client.js" }, "keywords": [ "nostr" ], "author": "pablof7z", - "license": "CC BY-NC-ND 4.0", + "license": "MIT", "dependencies": { "@fastify/formbody": "^7.4.0", "@fastify/view": "^8.2.0", "@inquirer/password": "^1.1.2", "@inquirer/prompts": "^1.2.3", - "@nostr-dev-kit/ndk": "^2.1.3", + "@nostr-dev-kit/ndk": "^2.2.0", "@prisma/client": "^5.4.1", "@scure/base": "^1.1.1", "@types/yargs": "^17.0.24", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 729ca0f..aee4dd3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ dependencies: specifier: ^1.2.3 version: 1.2.3 '@nostr-dev-kit/ndk': - specifier: ^2.1.3 - version: 2.1.3(typescript@5.1.3) + specifier: ^2.2.0 + version: 2.2.0(typescript@5.1.3) '@prisma/client': specifier: ^5.4.1 version: 5.4.1(prisma@5.4.1) @@ -40,10 +40,10 @@ dependencies: version: 16.3.1 eslint-config-prettier: specifier: ^8.8.0 - version: 8.8.0(eslint@8.54.0) + version: 8.8.0(eslint@8.55.0) eslint-plugin-import: specifier: ^2.27.5 - version: 2.27.5(eslint@8.54.0) + version: 2.27.5(eslint@8.55.0) eventemitter3: specifier: ^5.0.1 version: 5.0.1 @@ -307,13 +307,13 @@ packages: dev: true optional: true - /@eslint-community/eslint-utils@4.4.0(eslint@8.54.0): + /@eslint-community/eslint-utils@4.4.0(eslint@8.55.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 dependencies: - eslint: 8.54.0 + eslint: 8.55.0 eslint-visitor-keys: 3.4.3 dev: false @@ -322,8 +322,8 @@ packages: engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} dev: false - /@eslint/eslintrc@2.1.3: - resolution: {integrity: sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==} + /@eslint/eslintrc@2.1.4: + resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 @@ -339,8 +339,8 @@ packages: - supports-color dev: false - /@eslint/js@8.54.0: - resolution: {integrity: sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==} + /@eslint/js@8.55.0: + resolution: {integrity: sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: false @@ -604,8 +604,8 @@ packages: '@nodelib/fs.scandir': 2.1.5 fastq: 1.15.0 - /@nostr-dev-kit/ndk@2.1.3(typescript@5.1.3): - resolution: {integrity: sha512-GUJNc69kSvQWEjPlAUh6pyvAehnzApPPTjv97Mrmk8C/frPt5O2jHr62OgSVlXlj5AWUegDn2hnbtiZjGVPtWw==} + /@nostr-dev-kit/ndk@2.2.0(typescript@5.1.3): + resolution: {integrity: sha512-NdnErX8em9Y/qC4CVYTHYE0bvtLV2ZQh56+JOiarjeJd+J7ZdJX1P10ba463iEOodppvKZqFlYbuDU6CprehUA==} dependencies: '@noble/hashes': 1.3.2 '@noble/secp256k1': 2.0.0 @@ -1365,13 +1365,13 @@ packages: engines: {node: '>=10'} dev: false - /eslint-config-prettier@8.8.0(eslint@8.54.0): + /eslint-config-prettier@8.8.0(eslint@8.55.0): resolution: {integrity: sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==} hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: - eslint: 8.54.0 + eslint: 8.55.0 dev: false /eslint-import-resolver-node@0.3.7: @@ -1384,7 +1384,7 @@ packages: - supports-color dev: false - /eslint-module-utils@2.8.0(eslint-import-resolver-node@0.3.7)(eslint@8.54.0): + /eslint-module-utils@2.8.0(eslint-import-resolver-node@0.3.7)(eslint@8.55.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} engines: {node: '>=4'} peerDependencies: @@ -1406,13 +1406,13 @@ packages: optional: true dependencies: debug: 3.2.7 - eslint: 8.54.0 + eslint: 8.55.0 eslint-import-resolver-node: 0.3.7 transitivePeerDependencies: - supports-color dev: false - /eslint-plugin-import@2.27.5(eslint@8.54.0): + /eslint-plugin-import@2.27.5(eslint@8.55.0): resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==} engines: {node: '>=4'} peerDependencies: @@ -1427,9 +1427,9 @@ packages: array.prototype.flatmap: 1.3.1 debug: 3.2.7 doctrine: 2.1.0 - eslint: 8.54.0 + eslint: 8.55.0 eslint-import-resolver-node: 0.3.7 - eslint-module-utils: 2.8.0(eslint-import-resolver-node@0.3.7)(eslint@8.54.0) + eslint-module-utils: 2.8.0(eslint-import-resolver-node@0.3.7)(eslint@8.55.0) has: 1.0.3 is-core-module: 2.12.1 is-glob: 4.0.3 @@ -1457,15 +1457,15 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: false - /eslint@8.54.0: - resolution: {integrity: sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==} + /eslint@8.55.0: + resolution: {integrity: sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.54.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.55.0) '@eslint-community/regexpp': 4.10.0 - '@eslint/eslintrc': 2.1.3 - '@eslint/js': 8.54.0 + '@eslint/eslintrc': 2.1.4 + '@eslint/js': 8.55.0 '@humanwhocodes/config-array': 0.11.13 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 diff --git a/src/client.ts b/src/client.ts index b0ca7a4..f3ee823 100644 --- a/src/client.ts +++ b/src/client.ts @@ -21,7 +21,7 @@ if (!command) { async function createNDK(): Promise { const ndk = new NDK({ - explicitRelayUrls: ['wss://relay.nsecbunker.com'], + explicitRelayUrls: ['wss://relay.nsecbunker.com', 'wss://relay.damus.io', 'wss://nos.lol'], }); if (debug) { ndk.pool.on('connect', () => console.log('✅ connected')); diff --git a/src/index.ts b/src/index.ts index 7ba25d8..c8b3620 100644 --- a/src/index.ts +++ b/src/index.ts @@ -7,12 +7,6 @@ import { setup } from './commands/setup.js'; import { addNsec } from './commands/add.js'; import { start } from './commands/start.js'; -console.log(`nsecBunker licensed under CC BY-NC-ND 4.0:`); -console.log(`free to use for non-commercial use`); -console.log(`Copyright by pablof7z 2023`); -console.log(`Contact for licensing`); -console.log(``); - const adminNpubs = process.env.ADMIN_NPUBS ? process.env.ADMIN_NPUBS.split(',') : []; const argv = yargs(hideBin(process.argv))