@libp2p/floodsub 1.0.2 → 1.0.3

package/dist/src/message/rpc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../src/message/rpc.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/floodsub",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "libp2p-floodsub, also known as pubsub-flood or just dumbsub, this implementation of pubsub focused on delivering an API for Publish/Subscribe, but with no CastTree Forming (it just floods the network).",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p-floodsub#readme",
@@ -127,38 +127,37 @@
     ]
   },
   "scripts": {
+    "clean": "aegir clean",
     "lint": "aegir lint",
-    "dep-check": "aegir dep-check dist/src/**/*.js dist/test/**/*.js",
-    "build": "tsc && npm run build:copy-proto-files",
-    "build:copy-proto-files": "mkdirp dist/src/message && cp src/message/*.js src/message/*.d.ts dist/src/message",
-    "generate": "npm run generate:proto && npm run generate:proto-types",
-    "generate:proto": "pbjs -t static-module -w es6 -r libp2p-floodsub --force-number --no-verify --no-delimited --no-create --no-beautify --no-defaults --lint eslint-disable -o src/message/rpc.js ./src/message/rpc.proto",
-    "generate:proto-types": "pbts -o src/message/rpc.d.ts src/message/rpc.js",
-    "pretest": "npm run build",
+    "dep-check": "aegir dep-check",
+    "build": "aegir build",
+    "generate": "protons ./src/message/rpc.proto",
     "test": "aegir test -f dist/test",
-    "test:chrome": "npm run test -- -t browser --cov",
-    "test:chrome-webworker": "npm run test -- -t webworker",
-    "test:firefox": "npm run test -- -t browser -- --browser firefox",
-    "test:firefox-webworker": "npm run test -- -t webworker -- --browser firefox",
-    "test:node": "npm run test -- -t node --cov",
-    "test:electron-main": "npm run test -- -t electron-main",
-    "release": "semantic-release"
+    "test:chrome": "aegir test -t browser --cov",
+    "test:chrome-webworker": "aegir test -t webworker",
+    "test:firefox": "aegir test -t browser -- --browser firefox",
+    "test:firefox-webworker": "aegir test -t webworker -- --browser firefox",
+    "test:node": "aegir test -t node --cov",
+    "test:electron-main": "aegir test -t electron-main",
+    "release": "aegir release"
   },
   "dependencies": {
-    "@libp2p/interfaces": "^1.3.18",
-    "@libp2p/logger": "^1.1.2",
-    "@libp2p/pubsub": "^1.2.12",
-    "protobufjs": "^6.11.2",
+    "@libp2p/interfaces": "^1.3.20",
+    "@libp2p/logger": "^1.1.3",
+    "@libp2p/pubsub": "^1.2.14",
+    "protons-runtime": "^1.0.2",
     "uint8arrays": "^3.0.0"
   },
   "devDependencies": {
-    "@libp2p/interface-compliance-tests": "^1.1.19",
-    "@libp2p/peer-id": "^1.1.8",
-    "@libp2p/peer-id-factory": "^1.0.8",
+    "@libp2p/interface-compliance-tests": "^1.1.21",
+    "@libp2p/peer-collections": "^1.0.1",
+    "@libp2p/peer-id": "^1.1.9",
+    "@libp2p/peer-id-factory": "^1.0.9",
     "@multiformats/multiaddr": "^10.1.8",
-    "aegir": "^36.1.3",
+    "aegir": "^37.0.7",
     "multiformats": "^9.4.5",
     "p-wait-for": "^4.1.0",
+    "protons": "^3.0.2",
     "sinon": "^13.0.1",
     "wherearewe": "^1.0.0"
   }

package/src/index.ts

@@ -51,7 +51,7 @@ export class FloodSub extends PubSubBaseProtocol implements PubSub {
    * Encode an RPC object into a Uint8Array
    */
   encodeRpc (rpc: PubSubRPC): Uint8Array {
-    return RPC.encode(rpc).finish()
+    return RPC.encode(rpc)
   }
 
   decodeMessage (bytes: Uint8Array): PubSubRPCMessage {
@@ -59,7 +59,7 @@ export class FloodSub extends PubSubBaseProtocol implements PubSub {
   }
 
   encodeMessage (rpc: PubSubRPCMessage): Uint8Array {
-    return RPC.Message.encode(rpc).finish()
+    return RPC.Message.encode(rpc)
   }
 
   /**

package/src/message/rpc.ts

@@ -0,0 +1,213 @@
+/* eslint-disable import/export */
+/* eslint-disable @typescript-eslint/no-namespace */
+
+import { encodeMessage, decodeMessage, message, bool, string, bytes, uint64 } from 'protons-runtime'
+
+export interface RPC {
+  subscriptions: RPC.SubOpts[]
+  messages: RPC.Message[]
+  control?: ControlMessage
+}
+
+export namespace RPC {
+  export interface SubOpts {
+    subscribe?: boolean
+    topic?: string
+  }
+
+  export namespace SubOpts {
+    export const codec = () => {
+      return message<SubOpts>({
+        1: { name: 'subscribe', codec: bool, optional: true },
+        2: { name: 'topic', codec: string, optional: true }
+      })
+    }
+
+    export const encode = (obj: SubOpts): Uint8Array => {
+      return encodeMessage(obj, SubOpts.codec())
+    }
+
+    export const decode = (buf: Uint8Array): SubOpts => {
+      return decodeMessage(buf, SubOpts.codec())
+    }
+  }
+  export interface Message {
+    from?: Uint8Array
+    data?: Uint8Array
+    sequenceNumber?: Uint8Array
+    topic?: string
+    signature?: Uint8Array
+    key?: Uint8Array
+  }
+
+  export namespace Message {
+    export const codec = () => {
+      return message<Message>({
+        1: { name: 'from', codec: bytes, optional: true },
+        2: { name: 'data', codec: bytes, optional: true },
+        3: { name: 'sequenceNumber', codec: bytes, optional: true },
+        4: { name: 'topic', codec: string, optional: true },
+        5: { name: 'signature', codec: bytes, optional: true },
+        6: { name: 'key', codec: bytes, optional: true }
+      })
+    }
+
+    export const encode = (obj: Message): Uint8Array => {
+      return encodeMessage(obj, Message.codec())
+    }
+
+    export const decode = (buf: Uint8Array): Message => {
+      return decodeMessage(buf, Message.codec())
+    }
+  }
+
+  export const codec = () => {
+    return message<RPC>({
+      1: { name: 'subscriptions', codec: RPC.SubOpts.codec(), repeats: true },
+      2: { name: 'messages', codec: RPC.Message.codec(), repeats: true },
+      3: { name: 'control', codec: ControlMessage.codec(), optional: true }
+    })
+  }
+
+  export const encode = (obj: RPC): Uint8Array => {
+    return encodeMessage(obj, RPC.codec())
+  }
+
+  export const decode = (buf: Uint8Array): RPC => {
+    return decodeMessage(buf, RPC.codec())
+  }
+}
+
+export interface ControlMessage {
+  ihave: ControlIHave[]
+  iwant: ControlIWant[]
+  graft: ControlGraft[]
+  prune: ControlPrune[]
+}
+
+export namespace ControlMessage {
+  export const codec = () => {
+    return message<ControlMessage>({
+      1: { name: 'ihave', codec: ControlIHave.codec(), repeats: true },
+      2: { name: 'iwant', codec: ControlIWant.codec(), repeats: true },
+      3: { name: 'graft', codec: ControlGraft.codec(), repeats: true },
+      4: { name: 'prune', codec: ControlPrune.codec(), repeats: true }
+    })
+  }
+
+  export const encode = (obj: ControlMessage): Uint8Array => {
+    return encodeMessage(obj, ControlMessage.codec())
+  }
+
+  export const decode = (buf: Uint8Array): ControlMessage => {
+    return decodeMessage(buf, ControlMessage.codec())
+  }
+}
+
+export interface ControlIHave {
+  topic?: string
+  messageIDs: Uint8Array[]
+}
+
+export namespace ControlIHave {
+  export const codec = () => {
+    return message<ControlIHave>({
+      1: { name: 'topic', codec: string, optional: true },
+      2: { name: 'messageIDs', codec: bytes, repeats: true }
+    })
+  }
+
+  export const encode = (obj: ControlIHave): Uint8Array => {
+    return encodeMessage(obj, ControlIHave.codec())
+  }
+
+  export const decode = (buf: Uint8Array): ControlIHave => {
+    return decodeMessage(buf, ControlIHave.codec())
+  }
+}
+
+export interface ControlIWant {
+  messageIDs: Uint8Array[]
+}
+
+export namespace ControlIWant {
+  export const codec = () => {
+    return message<ControlIWant>({
+      1: { name: 'messageIDs', codec: bytes, repeats: true }
+    })
+  }
+
+  export const encode = (obj: ControlIWant): Uint8Array => {
+    return encodeMessage(obj, ControlIWant.codec())
+  }
+
+  export const decode = (buf: Uint8Array): ControlIWant => {
+    return decodeMessage(buf, ControlIWant.codec())
+  }
+}
+
+export interface ControlGraft {
+  topic?: string
+}
+
+export namespace ControlGraft {
+  export const codec = () => {
+    return message<ControlGraft>({
+      1: { name: 'topic', codec: string, optional: true }
+    })
+  }
+
+  export const encode = (obj: ControlGraft): Uint8Array => {
+    return encodeMessage(obj, ControlGraft.codec())
+  }
+
+  export const decode = (buf: Uint8Array): ControlGraft => {
+    return decodeMessage(buf, ControlGraft.codec())
+  }
+}
+
+export interface ControlPrune {
+  topic?: string
+  peers: PeerInfo[]
+  backoff?: bigint
+}
+
+export namespace ControlPrune {
+  export const codec = () => {
+    return message<ControlPrune>({
+      1: { name: 'topic', codec: string, optional: true },
+      2: { name: 'peers', codec: PeerInfo.codec(), repeats: true },
+      3: { name: 'backoff', codec: uint64, optional: true }
+    })
+  }
+
+  export const encode = (obj: ControlPrune): Uint8Array => {
+    return encodeMessage(obj, ControlPrune.codec())
+  }
+
+  export const decode = (buf: Uint8Array): ControlPrune => {
+    return decodeMessage(buf, ControlPrune.codec())
+  }
+}
+
+export interface PeerInfo {
+  peerID?: Uint8Array
+  signedPeerRecord?: Uint8Array
+}
+
+export namespace PeerInfo {
+  export const codec = () => {
+    return message<PeerInfo>({
+      1: { name: 'peerID', codec: bytes, optional: true },
+      2: { name: 'signedPeerRecord', codec: bytes, optional: true }
+    })
+  }
+
+  export const encode = (obj: PeerInfo): Uint8Array => {
+    return encodeMessage(obj, PeerInfo.codec())
+  }
+
+  export const decode = (buf: Uint8Array): PeerInfo => {
+    return decodeMessage(buf, PeerInfo.codec())
+  }
+}