@leofcoin/peernet 0.10.8 → 0.11.2

package/src/proto/chat-message.proto.js

@@ -1,7 +1,7 @@
-export default `
-message ChatMessage {
-  required string value = 1;
-  required string author = 2;
-  required uint64 timestamp = 3;
-  repeated string files = 4;
-}`
+export default `
+message ChatMessage {
+  required string value = 1;
+  required string author = 2;
+  required uint64 timestamp = 3;
+  repeated string files = 4;
+}`

package/src/proto/peernet.proto.js

@@ -3,7 +3,7 @@ export default `
 message PeernetMessage {
   required bytes data = 1;
   required bytes signature = 2;
-  optional bytes from = 3;
-  optional bytes to = 4;
+  optional string from = 3;
+  optional string to = 4;
   optional string id = 5;
 }`

package/src/utils/utils.js

@@ -1,78 +1,78 @@
-import fetch from 'node-fetch'
-import Codec from './../codec/codec.js'
-
-export const expected = (expected, actual) => {
-  const rule = (entry) => {
-    return !entry ? `: undefined - ${entry} ` :`: ${typeof entry} - `
-  }
-
-  const entries = Object.entries(actual)
-      .map((entry) => entry.join(rule(entry[1])));
-
-  return `\nExpected:
-    ${expected.join('\n\t')}
-
-    actual:
-      ${entries.join('\n\t')}`;
-}
-
-export const debug = (log) => {
-  if (globalThis.DEBUG || globalThis.debug) console.log(`%c ${log}`, 'color: #0080ff;')
-}
-
-export const protoFor = (data) => {
-  if (!Buffer.isBuffer(data)) data = Buffer.from(data)
-  const codec = new Codec(data)
-  if (!codec.name) throw new Error('proto not found')
-  const Proto = globalThis.peernet.protos[codec.name]
-  if (!Proto) throw (new Error(`No proto defined for ${codec.name}`))
-  return new Proto(data)
-}
-
-/**
- * wether or not a peernet daemon is active
- * @return {Boolean}
- */
-export const hasDaemon = async () => {
-  try {
-    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) {
-    return false
-  }
-}
-
-export const https = () => {
-  if (!globalThis.location) return false;
-  return Boolean(globalThis.location.protocol === 'https:')
-}
-
-/**
- * Get current environment
- * @return {String} current environment [node, electron, browser]
- */
-export const environment = () => {
-  const _navigator = globalThis.navigator
-  if (!_navigator) {
-    return 'node'
-  } else if (_navigator && /electron/i.test(_navigator.userAgent)) {
-    return 'electron'
-  } else {
-    return 'browser'
-  }
-}
-
-/**
- * * Get current environment
- * @return {Object} result
- * @property {Boolean} reult.daemon whether or not daemon is running
- * @property {Boolean} reult.environment Current environment
- */
-export const target = async () => {
-  let daemon = false
-  const env = await environment()
-  if (!https()) daemon = await hasDaemon()
-
-  return {daemon, environment: env}
-}
+import fetch from 'node-fetch'
+import Codec from './../codec/codec.js'
+
+export const expected = (expected, actual) => {
+  const rule = (entry) => {
+    return !entry ? `: undefined - ${entry} ` :`: ${typeof entry} - `
+  }
+
+  const entries = Object.entries(actual)
+      .map((entry) => entry.join(rule(entry[1])));
+
+  return `\nExpected:
+    ${expected.join('\n\t')}
+
+    actual:
+      ${entries.join('\n\t')}`;
+}
+
+export const debug = (log) => {
+  if (globalThis.DEBUG || globalThis.debug) console.log(`%c ${log}`, 'color: #0080ff;')
+}
+
+export const protoFor = (data) => {
+  if (!Buffer.isBuffer(data)) data = Buffer.from(data)
+  const codec = new Codec(data)
+  if (!codec.name) throw new Error('proto not found')
+  const Proto = globalThis.peernet.protos[codec.name]
+  if (!Proto) throw (new Error(`No proto defined for ${codec.name}`))
+  return new Proto(data)
+}
+
+/**
+ * wether or not a peernet daemon is active
+ * @return {Boolean}
+ */
+export const hasDaemon = async () => {
+  try {
+    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) {
+    return false
+  }
+}
+
+export const https = () => {
+  if (!globalThis.location) return false;
+  return Boolean(globalThis.location.protocol === 'https:')
+}
+
+/**
+ * Get current environment
+ * @return {String} current environment [node, electron, browser]
+ */
+export const environment = () => {
+  const _navigator = globalThis.navigator
+  if (!_navigator) {
+    return 'node'
+  } else if (_navigator && /electron/i.test(_navigator.userAgent)) {
+    return 'electron'
+  } else {
+    return 'browser'
+  }
+}
+
+/**
+ * * Get current environment
+ * @return {Object} result
+ * @property {Boolean} reult.daemon whether or not daemon is running
+ * @property {Boolean} reult.environment Current environment
+ */
+export const target = async () => {
+  let daemon = false
+  const env = await environment()
+  if (!https()) daemon = await hasDaemon()
+
+  return {daemon, environment: env}
+}

package/test/codec.js

@@ -3,17 +3,18 @@ const Codec = require('./../dist/commonjs/codec.js')
 
 const block = '4lmacqas6kpnmvehxpmlvsndgydw5i46mf2pgnaub72eug63dozkw4oqxhk3fazbhkguvlhslcaeqm5jtwghxdk5nvmuakrs7yi2gl6xqmmmw';
 const itx = '5hmacqb6ao252jmbhkhu5isr4yua3jnkhgb5ejjbiomrlzglwarlb777wq7aw5nfz5m4pubx5uffaxp2cqc4ckrh4xirss4nkujvcjbnmomtm';
-const dht = '5demcay'
+const dht = 'b4wiyebqbigjfvm5mizik7ke3v6lyhoahecqiwergnl3cytarf5bd2qvqase'
 const message = '4xnmcay'
 const data = '4hemcay'
 globalThis.peernet = {};
+console.log(parseInt('706468', 16));
 
 test('peernet dht codec', tape => {
   tape.plan(2)
 
   const codec = new Codec(dht)
   const codec2 = new Codec(codec.encoded)
-  tape.equal(codec.name, 'peernet-dht', `name from encoded is valid ${codec.name}`)
+  tape.equal(codec.name, 'peernet-dht-response', `name from encoded is valid ${codec.name}`)
   tape.equal(codec.name, codec2.name, `decoded name is valid ${codec.name}`)
 })
 

package/test/messages.js

@@ -1,8 +1,7 @@
 const test = require('tape')
 const Node = require('./../dist/commonjs/dht-response.js')
 
-const response = '6lemcaykavugk3dmn4iac'
-const responseHash = '6lemcazaudes2wowemufpvcn27f4dxadsbielcitgv5rmjqis6qr5ikyajca'
+const responseHash = 'cqbigjfvm5mizik7ke3v6lyhoahecqiwergnl3cytarf5bd2qvqase'
 
 const block = '4lmacqas6kpnmvehxpmlvsndgydw5i46mf2pgnaub72eug63dozkw4oqxhk3fazbhkguvlhslcaeqm5jtwghxdk5nvmuakrs7yi2gl6xqmmmw';
 const itx = '5hmacqb6ao252jmbhkhu5isr4yua3jnkhgb5ejjbiomrlzglwarlb777wq7aw5nfz5m4pubx5uffaxp2cqc4ckrh4xirss4nkujvcjbnmomtm';
@@ -10,12 +9,16 @@ const dht = '5demcay'
 
 const message = '4xnmcay'
 const data = '4hemcay'
-
+globalThis.peernet = {
+  codecs: {}
+}
 test('peernet message dht-response', tape => {
   tape.plan(4)
   const n = new Node({ hash: 'hello', has: true })
-  const node = new Node(response)
+  console.log(n.hash);
+  const node = new Node(n.encoded)
   const node2 = new Node(node.encoded)
+
   tape.equal(node.name, 'peernet-dht-response', `name from encoded is valid ${node.name}`)
   tape.equal(node.name, node2.name, `decoded name is valid ${node.name}`)
   tape.equal(node.hash, responseHash, `hash from encoded is valid ${node.hash}`)

package/test.js

@@ -7,14 +7,21 @@ pubsub.subscribe('peer:connected', async peer => {
   const request = new globalThis.peernet.protos['peernet-request']({
           request:'lastBlock'
         })
-  const to = peernet._getPeerId(peer.id)
+  const to = peer.id
+  console.log(request);
   const node = await peernet.prepareMessage(to, request.encoded)
+  console.log({node});
   let response = await peer.request(node.encoded)
   console.log({response});
-  const proto = new globalThis.peernet.protos['peernet-message'](Buffer.from(response.data))
-  response = new globalThis.peernet.protos['peernet-response'](Buffer.from(proto.decoded.data))
+  const keys = Object.keys(response)
+  const uint8Array = new Uint8Array(keys.length)
+  for (const key of keys) {
+    uint8Array[Number(key)] = response[key]
+  }
+  const proto = new globalThis.peernet.protos['peernet-message'](uint8Array)
+  console.log(proto.decoded.data);
+  response = new globalThis.peernet.protos['peernet-response'](proto.decoded.data)
   console.log({response});
-  console.log();
 
   const block = JSON.parse(response.decoded.response)
   console.log(block);

package/webpack.config.js

@@ -0,0 +1,41 @@
+const path = require('path');
+const webpack = require('webpack');
+module.exports = {
+  entry: './src/peernet.js',
+  plugins: [
+    // Work around for Buffer is undefined:
+    // https://github.com/webpack/changelog-v5/issues/10
+    new webpack.ProvidePlugin({
+        Buffer: ['buffer', 'Buffer'],
+    }),
+    new webpack.ProvidePlugin({
+        process: 'process/browser',
+  }),
+  new webpack.DefinePlugin({
+    HTTP_IMPORT: '',
+		"import fetch from 'node-fetch'": ''
+  })
+],
+optimization: {
+  minimize: false
+},
+resolve: {
+        extensions: [ '.ts', '.js' ],
+        fallback: {
+          fs: false,
+          util: false,
+          "stream": require.resolve("stream-browserify"),
+          "buffer": require.resolve("buffer"),
+          "path": require.resolve("path-browserify"),
+          "os": require.resolve("os-browserify")
+        }
+    },
+  output: {
+    library: {
+      name: 'Peernet',
+      type: 'global'
+    },
+    filename: 'peernet.js',
+    path: path.resolve(__dirname, 'dist', 'browser'),
+  },
+};