@leofcoin/peernet 0.11.0 → 0.11.3

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/proto/response.proto.js

@@ -1,6 +1,6 @@
 export default `
 // PeernetResponseMessage
 message PeernetResponseMessage {
-  required string response = 1;
+  required bytes response = 1;
 }
 `

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.js

@@ -23,6 +23,6 @@ pubsub.subscribe('peer:connected', async peer => {
   response = new globalThis.peernet.protos['peernet-response'](proto.decoded.data)
   console.log({response});
 
-  const block = JSON.parse(response.decoded.response)
+  const block = new TextDecoder().decode(response.decoded.response)
   console.log(block);
 })

package/webpack.config.js

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