@leofcoin/peernet 0.13.3 → 0.14.1

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.13.3",
+  "version": "0.14.1",
   "description": "",
+  "source": "src/peernet.js",
   "main": "dist/commonjs/peernet.js",
-  "module": "src/module/peernet.js",
+  "module": "dist/module/peernet.js",
+  "targets": [
+    "browser"
+  ],
   "scripts": {
     "build": "npm run c && webpack",
     "test": "node test/index.js",
@@ -15,18 +19,20 @@
     "coveralls": "cat ./coverage/lcov.info | coveralls",
     "c": "rollup -c",
     "w": "rollup -c -w",
-    "b": "browserify dist/browser/peernet.js -o dist/browser/peernet.js --standalone Peernet && rm browser.js"
+    "watch": "parcel watch",
+    "parcel-build": "parcel build",
+    "b": "browserify dist/module/peernet.js -o dist/module/peernet.js --standalone Peernet && rm browser.js"
   },
   "keywords": [],
   "author": "",
   "license": "MIT",
-  "browserslist": "> 0.5%, last 2 versions, not dead",
+  "browserslist": "> 5%, last 2 versions, not dead",
   "dependencies": {
     "@leofcoin/codec-format-interface": "^1.2.5",
     "@leofcoin/generate-account": "^1.0.4",
     "@leofcoin/multi-wallet": "^2.1.2",
     "@leofcoin/peernet-swarm": "^0.3.3",
-    "@leofcoin/storage": "^2.3.0",
+    "@leofcoin/storage": "^3.0.0",
     "@vandeurenglenn/base32": "^1.1.0",
     "@vandeurenglenn/base58": "^1.1.0",
     "@vandeurenglenn/debug": "^1.0.0",

package/rollup.config.js

@@ -1,6 +1,7 @@
 import { execSync } from 'child_process';
 import json from '@rollup/plugin-json'
 import modify from 'rollup-plugin-modify'
+import resolve from 'rollup-plugin-node-resolve'
 
 try {
 	execSync('rm dist -r')
@@ -26,7 +27,8 @@ export default [{
 	input: 'src/peernet.js',
 	output: {
 		dir: 'dist/module',
-		format: 'es'
+		format: 'cjs',
+		externals: ["@leofcoin/storage"]
 	},
 	plugins: [
 		json(),

package/src/handlers/message.js

@@ -1,4 +1,3 @@
-import MultiWallet from '@leofcoin/multi-wallet'
 import { CodecHash } from '@leofcoin/codec-format-interface'
 
 export default class MessageHandler {
@@ -18,7 +17,11 @@ export default class MessageHandler {
   async hashAndSignMessage(message) {
     const hasher = new CodecHash(message, {name: 'peernet-message'})
     let identity = await walletStore.get('identity')
-    identity = JSON.parse(new TextDecoder().decode(identity))
+    identity = JSON.parse(identity)
+    if (!globalThis.MultiWallet) {
+      const importee = await import(/* webpackChunkName: "storage" */ '@leofcoin/multi-wallet')
+      globalThis.LeofcoinStorage = importee.default
+    }
     const wallet = new MultiWallet(this.network)
     wallet.recover(identity.mnemonic)
     return wallet.sign(Buffer.from(hasher.hash).slice(0, 32))

package/src/peer-info.js

@@ -1,9 +1,9 @@
-import CodecFormat from './codec/codec-format-interface'
-
-export default class PeerInfo extends CodecFormat {
-  constructor(data, options) {
-    super(data, options)
-
-    this.keys = ['id', 'address', 'family']
-  }
-}
+import CodecFormat from './codec/codec-format-interface'
+
+export default class PeerInfo extends CodecFormat {
+  constructor(data, options) {
+    super(data, options)
+
+    this.keys = ['id', 'address', 'family']
+  }
+}

package/src/peernet.js

@@ -2,14 +2,13 @@ import '@vandeurenglenn/debug'
 import PubSub from '@vandeurenglenn/little-pubsub'
 import PeerDiscovery from './discovery/peer-discovery'
 import DHT from './dht/dht.js'
-import { CodecHash, codecs} from '@leofcoin/codec-format-interface'
+import codecs from './../node_modules/@leofcoin/codec-format-interface/src/codecs'
 import { 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 {parse} from 'path'
+  
 globalThis.leofcoin = globalThis.leofcoin || {}
 globalThis.pubsub = globalThis.pubsub || new PubSub()
 globalThis.globalSub = globalThis.globalSub || new PubSub({verbose: true})
@@ -197,36 +196,33 @@ export default class Peernet {
       await this.addStore(store, options.storePrefix, options.root)
     }
 
-    try {
+    const accountExists = await accountStore.has('public')
+    if (accountExists) {
       const pub = await accountStore.get('public')
-      this.id = JSON.parse(new TextDecoder().decode(pub)).walletId
+      this.id = JSON.parse(pub).walletId
       let accounts = await walletStore.get('accounts')
-      accounts = new TextDecoder().decode(accounts)
+      
+      
 
       // fixing account issue (string while needs to be a JSON)
       // TODO: remove when on mainnet
       try {
-        this.accounts = JSON.parse(account)
+        this.accounts = JSON.parse(accounts)
       } catch (e) {
         this.accounts = [accounts.split(',')]
       }
-    } catch (e) {
-      if (e.code === 'ERR_NOT_FOUND') {
-
-        const importee = await import(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account')
-        const generateAccount = importee.default
-        const wallet = {}
-        const {identity, accounts, config} = await generateAccount(this.network)
-        walletStore.put('version', new TextEncoder().encode(1))
-        walletStore.put('accounts', new TextEncoder().encode(JSON.stringify(accounts)))
-        walletStore.put('identity', new TextEncoder().encode(JSON.stringify(identity)))
-        await accountStore.put('config', new TextEncoder().encode(JSON.stringify(config)));
-        await accountStore.put('public', new TextEncoder().encode(JSON.stringify({walletId: identity.walletId})));
-
-        this.id = identity.walletId
-      } else {
-        throw e
-      }
+    } else {
+      const importee = await import(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account')
+      const generateAccount = importee.default
+      const {identity, accounts, config} = await generateAccount(this.network)
+      // await accountStore.put('config', JSON.stringify(config));
+      await accountStore.put('public', JSON.stringify({walletId: identity.walletId}));
+      
+      await walletStore.put('version', String(1))
+      await walletStore.put('accounts', JSON.stringify(accounts))
+      await walletStore.put('identity', JSON.stringify(identity))
+
+      this.id = identity.walletId
     }
     this._peerHandler = new PeerDiscovery(this.id)
     this.peerId = this.id
@@ -570,7 +566,7 @@ export default class Peernet {
     return hash
   }
 
-  async ls(hash) {
+  async ls(hash, options) {
     let data
     const has = await dataStore.has(hash)
     if (has) data = await dataStore.get(hash)
@@ -582,18 +578,19 @@ export default class Peernet {
     for (const {path, hash} of node.decoded.links) {
       paths.push({path, hash})
     }
-
+    if (options?.pin) await dataStore.put(hash, node.encoded)
     return paths
   }
 
-  async cat(hash) {
+  async cat(hash, options) {
     let data
     const has = await dataStore.has(hash)
     if (has) data = await dataStore.get(hash)
     else data = await this.requestData(hash, 'data')
     const node = await new peernet.protos['peernet-file'](data)
-    const paths = []
+
     if (node.decoded?.links.length > 0) throw new Error(`${hash} is a directory`)
+    if (options?.pin) await dataStore.put(hash, node.encoded)
     return node.decoded.content
   }
 
@@ -705,3 +702,4 @@ export default class Peernet {
   //
   // }
 }
+globalThis.Peernet = Peernet

package/webpack.config.js

@@ -1,7 +1,9 @@
 const path = require('path');
 const webpack = require('webpack');
 module.exports = [{
-  entry: './src/peernet.js',
+  entry: {
+    peernet: './dist/module/peernet.js'
+  },
   mode: 'production',
   plugins: [
     // Work around for Buffer is undefined:
@@ -26,9 +28,9 @@ module.exports = [{
 optimization: {
   minimize: false
 },
-experiments: {
-  outputModule: true
-},
+// experiments: {
+//   outputModule: true
+// },
 resolve: {
         extensions: [ '.ts', '.js' ],
         fallback: {
@@ -39,15 +41,19 @@ resolve: {
           "path": require.resolve("path-browserify"),
           "os": require.resolve("os-browserify"),
           "crypto": require.resolve("crypto-browserify"),
-          "vm": require.resolve("vm-browserify")
+          "vm": require.resolve("vm-browserify"),
+          "@store:import": require.resolve("@leofcoin/storage/src/store-shim.js")
         }
     },
   output: {
+    // library: {
+    //   type: 'module'
+    // },
     library: {
-      type: 'module'
+      type: 'global'
     },
     chunkFilename: '[name].js',
-    filename: 'peernet.js',
+    filename: '[name].js',
     path: path.resolve(__dirname, 'dist', 'browser'),
   },
 }];

package/dist/browser/generate-account.js

@@ -1,50 +0,0 @@
-(self["webpackChunk_leofcoin_peernet"] = self["webpackChunk_leofcoin_peernet"] || []).push([[510],{
-
-/***/ 5162:
-/***/ (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__(9755);
-
-
-/**
- * @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"] */ .Z(network);
-    /**
-     * @type {string}
-     */
-    const mnemonic = await wallet.generate();
-
-    wallet = new _leofcoin_multi_wallet__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z(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: {
-      //  }
-    }
-  });
-
-
-/***/ })
-
-}])