@leofcoin/peernet 0.15.1 → 0.16.0

package/.eslintrc.json

@@ -1,25 +1,13 @@
 {
   "env": {
-    "node": true,
-    "browser": true,
-    "es6": true
+    "es2022": true
   },
   "parserOptions": {
-    "ecmaVersion": 2018,
+    "ecmaVersion": "latest",
     "sourceType": "module"
   },
-  "extends": ["eslint:recommended", "google"],
-  "rules": {
-    "semi": 0,
-    "object-curly-spacing": 0,
-    "max-len": ["error", {
-        "code": 100,
-        "ignoreComments": true,
-        "ignoreUrls": true,
-        "ignoreTrailingComments": true
-      }
-    ]
-  },
+  "extends": "plugin:unicorn/recommended",
+  
   "globals": {
     "globalThis": true,
     "accountStore": true,

package/dist/commonjs/peernet.js

@@ -2,8 +2,9 @@
 
 require('@vandeurenglenn/debug');
 var PubSub = require('@vandeurenglenn/little-pubsub');
-var fetch = require('node-fetch');
 var codecFormatInterface = require('@leofcoin/codec-format-interface');
+var fetch$1 = require('node-fetch');
+var LeofcoinStorage = require('@leofcoin/storage/src/storage');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -26,7 +27,8 @@ function _interopNamespace(e) {
 }
 
 var PubSub__default = /*#__PURE__*/_interopDefaultLegacy(PubSub);
-var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
+var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch$1);
+var LeofcoinStorage__default = /*#__PURE__*/_interopDefaultLegacy(LeofcoinStorage);
 
 const BufferToUint8Array = data => {
   if (data.type === 'Buffer') {
@@ -49,7 +51,7 @@ const protoFor = (message) => {
  */
 const hasDaemon = async () => {
   try {
-    let response = await fetch__default["default"]('http://127.0.0.1:1000/api/version');
+    let response = await fetch('http://127.0.0.1:1000/api/version');
     response = await response.json();
     return Boolean(response.client === '@peernet/api/http')
   } catch (e) {
@@ -85,10 +87,9 @@ const environment = () => {
  */
 const target = async () => {
   let daemon = false;
-  const env = await environment();
   if (!https()) daemon = await hasDaemon();
 
-  return {daemon, environment: env}
+  return {daemon, environment: environment()}
 };
 
 class PeerDiscovery {
@@ -433,6 +434,8 @@ const nothingFoundError = (hash) => {
   return new Error(`nothing found for ${hash}`)
 };
 
+globalThis.LeofcoinStorage = LeofcoinStorage__default["default"];
+  
 globalThis.leofcoin = globalThis.leofcoin || {};
 globalThis.pubsub = globalThis.pubsub || new PubSub__default["default"]();
 globalThis.globalSub = globalThis.globalSub || new PubSub__default["default"]({verbose: true});
@@ -464,8 +467,8 @@ class Peernet {
     this.network = options.network || 'leofcoin';
     this.stars = options.stars;
     const parts = this.network.split(':');
-    this.networkVersion = parts.length > 1 ? parts[1] : 'mainnet';
-    
+    this.networkVersion = options.networkVersion ? options.networkVersion : parts.length > 1 ? parts[1] : 'mainnet';
+
     if (!options.storePrefix) options.storePrefix = 'lfc';
     if (!options.port) options.port = 2000;
     if (!options.root) {
@@ -498,10 +501,6 @@ class Peernet {
   }
 
   async addStore(name, prefix, root, isPrivate = true) {
-    if (!globalThis.LeofcoinStorage) {
-      const importee = await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(/* webpackChunkName: "storage" */ '@leofcoin/storage')); });
-      globalThis.LeofcoinStorage = importee.default;
-    }
     if (name === 'block' || name === 'transaction' || name === 'chain' ||
         name === 'data' || name === 'message') isPrivate = false;
 
@@ -509,7 +508,7 @@ class Peernet {
     if (this.hasDaemon) {
       Storage = LeofcoinStorageClient;
     } else {
-      Storage = LeofcoinStorage;
+      Storage = LeofcoinStorage__default["default"];
     }
     globalThis[`${name}Store`] = globalThis[`${name}Store`] ||
       await new Storage(name, root);

package/dist/module/peernet.js

@@ -1,6 +1,7 @@
 import '@vandeurenglenn/debug';
 import PubSub from '@vandeurenglenn/little-pubsub';
 import { Codec } from '@leofcoin/codec-format-interface';
+import LeofcoinStorage from '@leofcoin/storage/src/storage';
 
 const BufferToUint8Array = data => {
   if (data.type === 'Buffer') {
@@ -59,10 +60,9 @@ const environment = () => {
  */
 const target = async () => {
   let daemon = false;
-  const env = await environment();
   if (!https()) daemon = await hasDaemon();
 
-  return {daemon, environment: env}
+  return {daemon, environment: environment()}
 };
 
 class PeerDiscovery {
@@ -407,6 +407,8 @@ const nothingFoundError = (hash) => {
   return new Error(`nothing found for ${hash}`)
 };
 
+globalThis.LeofcoinStorage = LeofcoinStorage;
+  
 globalThis.leofcoin = globalThis.leofcoin || {};
 globalThis.pubsub = globalThis.pubsub || new PubSub();
 globalThis.globalSub = globalThis.globalSub || new PubSub({verbose: true});
@@ -438,8 +440,8 @@ class Peernet {
     this.network = options.network || 'leofcoin';
     this.stars = options.stars;
     const parts = this.network.split(':');
-    this.networkVersion = parts.length > 1 ? parts[1] : 'mainnet';
-    
+    this.networkVersion = options.networkVersion ? options.networkVersion : parts.length > 1 ? parts[1] : 'mainnet';
+
     if (!options.storePrefix) options.storePrefix = 'lfc';
     if (!options.port) options.port = 2000;
     if (!options.root) {
@@ -472,10 +474,6 @@ class Peernet {
   }
 
   async addStore(name, prefix, root, isPrivate = true) {
-    if (!globalThis.LeofcoinStorage) {
-      const importee = await import(/* webpackChunkName: "storage" */ '@leofcoin/storage');
-      globalThis.LeofcoinStorage = importee.default;
-    }
     if (name === 'block' || name === 'transaction' || name === 'chain' ||
         name === 'data' || name === 'message') isPrivate = false;
 

package/package.json

@@ -1,30 +1,22 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.15.1",
+  "version": "0.16.0",
   "description": "",
-  "source": "src/peernet.js",
-  "main": "dist/commonjs/peernet.js",
-  "module": "dist/module/peernet.js",
-  "targets": [
-    "browser"
-  ],
+  "main": "src/peernet.js",
+  "type": "module",
+  "engines": {
+    "node": ">=19.0.0"
+  },
   "scripts": {
-    "build": "npm run c && webpack",
-    "test": "node test/index.js",
+    "set-flags": "set NODE_OPTIONS=--openssl-legacy-provider",
+    "test": "npm run set-flags && node test/index.js",
     "server": "discovery-swarm-webrtc --port=4000",
     "demo": "jsproject --serve ./ --port 6868",
-    "doc": "esdoc",
-    "lint": "./node_modules/.bin/eslint src/**/**.js --fix",
-    "coverage": "nyc --reporter=lcov npm run test",
-    "coveralls": "cat ./coverage/lcov.info | coveralls",
-    "c": "rollup -c",
-    "w": "rollup -c -w",
-    "watch": "npm run w"
+    "lint": "./node_modules/.bin/eslint src/**/**.js --fix"
   },
   "keywords": [],
   "author": "",
   "license": "MIT",
-  "browserslist": "> 5%, last 2 versions, not dead",
   "dependencies": {
     "@leofcoin/codec-format-interface": "^1.4.0",
     "@leofcoin/generate-account": "^1.0.4",
@@ -36,25 +28,11 @@
     "@vandeurenglenn/debug": "^1.0.0",
     "@vandeurenglenn/is-hex": "^1.0.0",
     "@vandeurenglenn/little-pubsub": "^1.3.1",
-    "keccak": "^3.0.1",
-    "koa": "^2.13.1",
-    "node-fetch": "^2.6.1",
-    "readable-stream": "^4.2.0",
     "socket-request-client": "^1.5.0",
-    "socket-request-server": "^1.5.0",
-    "varint": "^6.0.0"
+    "socket-request-server": "^1.5.0"
   },
   "devDependencies": {
-    "@rollup/plugin-json": "^4.1.0",
-    "coveralls": "^3.1.1",
-    "eslint": "^7.31.0",
-    "eslint-config-google": "^0.14.0",
-    "nyc": "^15.1.0",
-    "path-browserify": "^1.0.1",
-    "rollup": "^2.70.2",
-    "rollup-plugin-modify": "^3.0.0",
-    "tape": "^5.2.2",
-    "webpack": "^5.72.0",
-    "webpack-cli": "^4.9.2"
+    "eslint": "^8.29.0",
+    "eslint-plugin-unicorn": "^45.0.1"
   }
 }

package/src/dht/dht.js

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch'
-
 /**
  * Keep history of fetched address and ptr
  * @property {Object} address

package/src/handlers/message.js

@@ -1,5 +1,3 @@
-import { CodecHash } from '@leofcoin/codec-format-interface'
-
 export default class MessageHandler {
   constructor(network) {
     this.network = network

package/src/peernet.js

@@ -1,13 +1,16 @@
 import '@vandeurenglenn/debug'
 import PubSub from '@vandeurenglenn/little-pubsub'
-import PeerDiscovery from './discovery/peer-discovery'
+import PeerDiscovery from './discovery/peer-discovery.js'
 import DHT from './dht/dht.js'
-import codecs from './../node_modules/@leofcoin/codec-format-interface/src/codecs'
+import codecs from './../node_modules/@leofcoin/codec-format-interface/src/codecs.js'
 import { BufferToUint8Array, protoFor, target } from './utils/utils.js'
 import MessageHandler from './handlers/message.js'
 import dataHandler from './handlers/data.js'
 import { encapsulatedError, dhtError,
   nothingFoundError } from './errors/errors.js'
+
+import LeofcoinStorage from '@leofcoin/storage'
+globalThis.LeofcoinStorage = LeofcoinStorage
   
 globalThis.leofcoin = globalThis.leofcoin || {}
 globalThis.pubsub = globalThis.pubsub || new PubSub()
@@ -40,8 +43,8 @@ export default class Peernet {
     this.network = options.network || 'leofcoin'
     this.stars = options.stars
     const parts = this.network.split(':')
-    this.networkVersion = parts.length > 1 ? parts[1] : 'mainnet'
-    
+    this.networkVersion = options.networkVersion ? options.networkVersion : parts.length > 1 ? parts[1] : 'mainnet'
+
     if (!options.storePrefix) options.storePrefix = 'lfc'
     if (!options.port) options.port = 2000
     if (!options.root) {
@@ -74,19 +77,13 @@ export default class Peernet {
   }
 
   async addStore(name, prefix, root, isPrivate = true) {
-    if (!globalThis.LeofcoinStorage) {
-      const importee = await import(/* webpackChunkName: "storage" */ '@leofcoin/storage')
-      globalThis.LeofcoinStorage = importee.default
-    }
     if (name === 'block' || name === 'transaction' || name === 'chain' ||
         name === 'data' || name === 'message') isPrivate = false
 
     let Storage
-    if (this.hasDaemon) {
-      Storage = LeofcoinStorageClient
-    } else {
-      Storage = LeofcoinStorage
-    }
+    
+    this.hasDaemon ? Storage = LeofcoinStorageClient : Storage = LeofcoinStorage
+    
     globalThis[`${name}Store`] = globalThis[`${name}Store`] ||
       await new Storage(name, root)
 

package/src/server.js

@@ -1,6 +1,5 @@
 import server from './../node_modules/socket-request-server/src/index.js';
-import socketResponse
-  from './../node_modules/socket-request-server/src/socket-response.js';
+import socketResponse from './../node_modules/socket-request-server/src/socket-response.js';
 
 globalThis.peerMap = new Map()
 

package/src/utils/utils.js

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch'
-
 import { Codec } from '@leofcoin/codec-format-interface'
 
 export const BufferToUint8Array = data => {
@@ -74,8 +72,7 @@ export const environment = () => {
  */
 export const target = async () => {
   let daemon = false
-  const env = await environment()
   if (!https()) daemon = await hasDaemon()
 
-  return {daemon, environment: env}
+  return {daemon, environment: environment()}
 }

package/test/codec.js

@@ -1,5 +1,5 @@
-const test = require('tape')
-const Codec = require('./../dist/commonjs/codec.js')
+import test from 'tape'
+import Codec from './../dist/commonjs/codec.js'
 
 const block = '4lmacqas6kpnmvehxpmlvsndgydw5i46mf2pgnaub72eug63dozkw4oqxhk3fazbhkguvlhslcaeqm5jtwghxdk5nvmuakrs7yi2gl6xqmmmw';
 const itx = '5hmacqb6ao252jmbhkhu5isr4yua3jnkhgb5ejjbiomrlzglwarlb777wq7aw5nfz5m4pubx5uffaxp2cqc4ckrh4xirss4nkujvcjbnmomtm';

package/test/index.js

@@ -1,4 +1,3 @@
-require('./messages')
-require('./codec')
+import './messages.js'
 // require('./peernet')
 // require('./hash')

package/test/messages.js

@@ -1,5 +1,5 @@
-const test = require('tape')
-const Node = require('./../dist/commonjs/dht-response.js')
+import test from 'tape'
+import Node from './../dist/commonjs/dht-response.js'
 
 const responseHash = 'cqbigjfvm5mizik7ke3v6lyhoahecqiwergnl3cytarf5bd2qvqase'
 

package/test.js

@@ -1,7 +1,7 @@
-const Client = require('./dist/commonjs/peernet.js');
+import Client from './src/peernet.js'
+
 
 
-(async () => {
   const client = await new Client({root: '.peernet/test'})
 
   // peernet.addFolder([{
@@ -44,4 +44,4 @@ const Client = require('./dist/commonjs/peernet.js');
     task()
   })
 
-})()
+

package/dist/browser/generate-account.js

@@ -1,51 +0,0 @@
-"use strict";
-(self["webpackChunk_leofcoin_peernet"] = self["webpackChunk_leofcoin_peernet"] || []).push([[510],{
-
-/***/ 162:
-/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _leofcoin_multi_wallet__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(755);
-
-
-/**
- * @params {String} network
- * @return {object} { identity, accounts, config }
- */
-/* harmony default export */ __webpack_exports__["default"] = (async network => {
-    let wallet = new _leofcoin_multi_wallet__WEBPACK_IMPORTED_MODULE_0__["default"](network);
-    /**
-     * @type {string}
-     */
-    const mnemonic = await wallet.generate();
-
-    wallet = new _leofcoin_multi_wallet__WEBPACK_IMPORTED_MODULE_0__["default"](network)
-    await wallet.recover(mnemonic, network)
-    /**
-     * @type {object}
-     */
-    const account = wallet.account(0)
-    /**
-     * @type {object}
-     */
-    const external = account.external(0)
-    const internal = account.internal(0)
-
-    return {
-      identity: {
-        mnemonic,
-        // multiWIF: wallet.export(),
-        publicKey: external.publicKey,
-        privateKey: external.privateKey,
-        walletId: external.id
-      },
-      accounts: [['main account', external.address, internal.address]]
-      // config: {
-      //  }
-    }
-  });
-
-
-/***/ })
-
-}]);

package/dist/browser/generate-account.mjs

@@ -1,50 +0,0 @@
-(self["webpackChunk_leofcoin_peernet"] = self["webpackChunk_leofcoin_peernet"] || []).push([[510],{
-
-/***/ 162:
-/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _leofcoin_multi_wallet__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(755);
-
-
-/**
- * @params {String} network
- * @return {object} { identity, accounts, config }
- */
-/* harmony default export */ __webpack_exports__["default"] = (async network => {
-    let wallet = new _leofcoin_multi_wallet__WEBPACK_IMPORTED_MODULE_0__["default"](network);
-    /**
-     * @type {string}
-     */
-    const mnemonic = await wallet.generate();
-
-    wallet = new _leofcoin_multi_wallet__WEBPACK_IMPORTED_MODULE_0__["default"](network)
-    await wallet.recover(mnemonic, network)
-    /**
-     * @type {object}
-     */
-    const account = wallet.account(0)
-    /**
-     * @type {object}
-     */
-    const external = account.external(0)
-    const internal = account.internal(0)
-
-    return {
-      identity: {
-        mnemonic,
-        // multiWIF: wallet.export(),
-        publicKey: external.publicKey,
-        privateKey: external.privateKey,
-        walletId: external.id
-      },
-      accounts: [['main account', external.address, internal.address]]
-      // config: {
-      //  }
-    }
-  });
-
-
-/***/ })
-
-}])