@libp2p/record 1.0.0 → 1.0.3

package/dist/src/index.d.ts

@@ -1,9 +1,9 @@
-import { IRecord } from './record.js';
+import { Record } from './record.js';
 export declare class Libp2pRecord {
     key: Uint8Array;
     value: Uint8Array;
-    timeReceived?: Date;
-    constructor(key: Uint8Array, value: Uint8Array, timeReceived?: Date);
+    timeReceived: Date;
+    constructor(key: Uint8Array, value: Uint8Array, timeReceived: Date);
     serialize(): Uint8Array;
     /**
      * Return the object format ready to be given to the protobuf library.
@@ -11,7 +11,7 @@ export declare class Libp2pRecord {
     prepareSerialize(): {
         key: Uint8Array;
         value: Uint8Array;
-        timeReceived: string | undefined;
+        timeReceived: string;
     };
     /**
      * Decode a protobuf encoded record
@@ -20,6 +20,6 @@ export declare class Libp2pRecord {
     /**
      * Create a record from the raw object returned from the protobuf library
      */
-    static fromDeserialized(obj: IRecord): Libp2pRecord;
+    static fromDeserialized(obj: Record): Libp2pRecord;
 }
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAER,MAAM,aAAa,CAAA;AAGpB,qBAAa,YAAY;IAChB,GAAG,EAAE,UAAU,CAAA;IACf,KAAK,EAAE,UAAU,CAAA;IACjB,YAAY,CAAC,EAAE,IAAI,CAAA;gBAEb,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,IAAI;IAcpE,SAAS;IAIT;;OAEG;IACH,gBAAgB;;;;;IAQhB;;OAEG;IACH,MAAM,CAAC,WAAW,CAAE,GAAG,EAAE,UAAU;IAUnC;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAE,GAAG,EAAE,OAAO;CAoBtC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACP,MAAM,aAAa,CAAA;AAGpB,qBAAa,YAAY;IAChB,GAAG,EAAE,UAAU,CAAA;IACf,KAAK,EAAE,UAAU,CAAA;IACjB,YAAY,EAAE,IAAI,CAAA;gBAEZ,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI;IAcnE,SAAS;IAIT;;OAEG;IACH,gBAAgB;;;;;IAQhB;;OAEG;IACH,MAAM,CAAC,WAAW,CAAE,GAAG,EAAE,UAAU;IAMnC;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAE,GAAG,EAAE,MAAM;CAiBrC"}

package/dist/src/index.js

@@ -1,4 +1,4 @@
-import { Record as PBRecord } from './record.js';
+import { Record } from './record.js';
 import * as utils from './utils.js';
 export class Libp2pRecord {
     constructor(key, value, timeReceived) {
@@ -13,7 +13,7 @@ export class Libp2pRecord {
         this.timeReceived = timeReceived;
     }
     serialize() {
-        return PBRecord.encode(this.prepareSerialize()).finish();
+        return Record.encode(this.prepareSerialize());
     }
     /**
      * Return the object format ready to be given to the protobuf library.
@@ -22,29 +22,21 @@ export class Libp2pRecord {
         return {
             key: this.key,
             value: this.value,
-            timeReceived: this.timeReceived != null ? utils.toRFC3339(this.timeReceived) : undefined
+            timeReceived: utils.toRFC3339(this.timeReceived)
         };
     }
     /**
      * Decode a protobuf encoded record
      */
     static deserialize(raw) {
-        const message = PBRecord.decode(raw);
-        return Libp2pRecord.fromDeserialized(PBRecord.toObject(message, {
-            defaults: false,
-            arrays: true,
-            longs: Number,
-            objects: false
-        }));
+        const rec = Record.decode(raw);
+        return new Libp2pRecord(rec.key, rec.value, new Date(rec.timeReceived));
     }
     /**
      * Create a record from the raw object returned from the protobuf library
      */
     static fromDeserialized(obj) {
-        let recvtime;
-        if (obj.timeReceived != null) {
-            recvtime = utils.parseRFC3339(obj.timeReceived);
-        }
+        const recvtime = utils.parseRFC3339(obj.timeReceived);
         if (obj.key == null) {
             throw new Error('key missing from deserialized object');
         }

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,IAAI,QAAQ,EACnB,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC,MAAM,OAAO,YAAY;IAKvB,YAAa,GAAe,EAAE,KAAiB,EAAE,YAAmB;QAClE,IAAI,CAAC,CAAC,GAAG,YAAY,UAAU,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;SAC5C;QAED,IAAI,CAAC,CAAC,KAAK,YAAY,UAAU,CAAC,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;SAC9C;QAED,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;IAClC,CAAC;IAED,SAAS;QACP,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAA;IAC1D,CAAC;IAED;;OAEG;IACH,gBAAgB;QACd,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS;SACzF,CAAA;IACH,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,WAAW,CAAE,GAAe;QACjC,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACpC,OAAO,YAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE;YAC9D,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,MAAM;YACb,OAAO,EAAE,KAAK;SACf,CAAC,CAAC,CAAA;IACL,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAE,GAAY;QACnC,IAAI,QAAQ,CAAA;QACZ,IAAI,GAAG,CAAC,YAAY,IAAI,IAAI,EAAE;YAC5B,QAAQ,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;SAChD;QAED,IAAI,GAAG,CAAC,GAAG,IAAI,IAAI,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;SACxD;QAED,IAAI,GAAG,CAAC,KAAK,IAAI,IAAI,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;SAC1D;QAED,MAAM,GAAG,GAAG,IAAI,YAAY,CAC1B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,CAC7B,CAAA;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;CACF"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACP,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC,MAAM,OAAO,YAAY;IAKvB,YAAa,GAAe,EAAE,KAAiB,EAAE,YAAkB;QACjE,IAAI,CAAC,CAAC,GAAG,YAAY,UAAU,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;SAC5C;QAED,IAAI,CAAC,CAAC,KAAK,YAAY,UAAU,CAAC,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;SAC9C;QAED,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;IAClC,CAAC;IAED,SAAS;QACP,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAA;IAC/C,CAAC;IAED;;OAEG;IACH,gBAAgB;QACd,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC;SACjD,CAAA;IACH,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,WAAW,CAAE,GAAe;QACjC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAE9B,OAAO,IAAI,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAA;IACzE,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,gBAAgB,CAAE,GAAW;QAClC,MAAM,QAAQ,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAErD,IAAI,GAAG,CAAC,GAAG,IAAI,IAAI,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;SACxD;QAED,IAAI,GAAG,CAAC,KAAK,IAAI,IAAI,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;SAC1D;QAED,MAAM,GAAG,GAAG,IAAI,YAAY,CAC1B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,CAC7B,CAAA;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;CACF"}

package/dist/src/record.d.ts

@@ -1,71 +1,12 @@
-import * as $protobuf from "protobufjs";
-/** Properties of a Record. */
-export interface IRecord {
-
-    /** Record key */
-    key?: (Uint8Array|null);
-
-    /** Record value */
-    value?: (Uint8Array|null);
-
-    /** Record timeReceived */
-    timeReceived?: (string|null);
+import type { Codec } from 'protons-runtime';
+export interface Record {
+    key: Uint8Array;
+    value: Uint8Array;
+    timeReceived: string;
 }
-
-/** Represents a Record. */
-export class Record implements IRecord {
-
-    /**
-     * Constructs a new Record.
-     * @param [p] Properties to set
-     */
-    constructor(p?: IRecord);
-
-    /** Record key. */
-    public key: Uint8Array;
-
-    /** Record value. */
-    public value: Uint8Array;
-
-    /** Record timeReceived. */
-    public timeReceived: string;
-
-    /**
-     * Encodes the specified Record message. Does not implicitly {@link Record.verify|verify} messages.
-     * @param m Record message or plain object to encode
-     * @param [w] Writer to encode to
-     * @returns Writer
-     */
-    public static encode(m: IRecord, w?: $protobuf.Writer): $protobuf.Writer;
-
-    /**
-     * Decodes a Record message from the specified reader or buffer.
-     * @param r Reader or buffer to decode from
-     * @param [l] Message length if known beforehand
-     * @returns Record
-     * @throws {Error} If the payload is not a reader or valid buffer
-     * @throws {$protobuf.util.ProtocolError} If required fields are missing
-     */
-    public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): Record;
-
-    /**
-     * Creates a Record message from a plain object. Also converts values to their respective internal types.
-     * @param d Plain object
-     * @returns Record
-     */
-    public static fromObject(d: { [k: string]: any }): Record;
-
-    /**
-     * Creates a plain object from a Record message. Also converts values to other types if specified.
-     * @param m Record
-     * @param [o] Conversion options
-     * @returns Plain object
-     */
-    public static toObject(m: Record, o?: $protobuf.IConversionOptions): { [k: string]: any };
-
-    /**
-     * Converts this Record to JSON.
-     * @returns JSON object
-     */
-    public toJSON(): { [k: string]: any };
+export declare namespace Record {
+    const codec: () => Codec<Record>;
+    const encode: (obj: Record) => Uint8Array;
+    const decode: (buf: Uint8Array) => Record;
 }
+//# sourceMappingURL=record.d.ts.map

package/dist/src/record.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"record.d.ts","sourceRoot":"","sources":["../../src/record.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AAE5C,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,UAAU,CAAA;IACf,KAAK,EAAE,UAAU,CAAA;IACjB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,yBAAiB,MAAM,CAAC;IACf,MAAM,KAAK,QAAO,MAAM,MAAM,CAMpC,CAAA;IAEM,MAAM,MAAM,QAAS,MAAM,KAAG,UAEpC,CAAA;IAEM,MAAM,MAAM,QAAS,UAAU,KAAG,MAExC,CAAA;CACF"}

package/dist/src/record.js

@@ -1,202 +1,20 @@
-/*eslint-disable*/
-import $protobuf from "protobufjs/minimal.js";
-
-// Common aliases
-const $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util;
-
-// Exported root namespace
-const $root = $protobuf.roots["libp2p-record"] || ($protobuf.roots["libp2p-record"] = {});
-
-export const Record = $root.Record = (() => {
-
-    /**
-     * Properties of a Record.
-     * @exports IRecord
-     * @interface IRecord
-     * @property {Uint8Array|null} [key] Record key
-     * @property {Uint8Array|null} [value] Record value
-     * @property {string|null} [timeReceived] Record timeReceived
-     */
-
-    /**
-     * Constructs a new Record.
-     * @exports Record
-     * @classdesc Represents a Record.
-     * @implements IRecord
-     * @constructor
-     * @param {IRecord=} [p] Properties to set
-     */
-    function Record(p) {
-        if (p)
-            for (var ks = Object.keys(p), i = 0; i < ks.length; ++i)
-                if (p[ks[i]] != null)
-                    this[ks[i]] = p[ks[i]];
-    }
-
-    /**
-     * Record key.
-     * @member {Uint8Array} key
-     * @memberof Record
-     * @instance
-     */
-    Record.prototype.key = $util.newBuffer([]);
-
-    /**
-     * Record value.
-     * @member {Uint8Array} value
-     * @memberof Record
-     * @instance
-     */
-    Record.prototype.value = $util.newBuffer([]);
-
-    /**
-     * Record timeReceived.
-     * @member {string} timeReceived
-     * @memberof Record
-     * @instance
-     */
-    Record.prototype.timeReceived = "";
-
-    /**
-     * Encodes the specified Record message. Does not implicitly {@link Record.verify|verify} messages.
-     * @function encode
-     * @memberof Record
-     * @static
-     * @param {IRecord} m Record message or plain object to encode
-     * @param {$protobuf.Writer} [w] Writer to encode to
-     * @returns {$protobuf.Writer} Writer
-     */
-    Record.encode = function encode(m, w) {
-        if (!w)
-            w = $Writer.create();
-        if (m.key != null && Object.hasOwnProperty.call(m, "key"))
-            w.uint32(10).bytes(m.key);
-        if (m.value != null && Object.hasOwnProperty.call(m, "value"))
-            w.uint32(18).bytes(m.value);
-        if (m.timeReceived != null && Object.hasOwnProperty.call(m, "timeReceived"))
-            w.uint32(42).string(m.timeReceived);
-        return w;
+/* eslint-disable import/export */
+/* eslint-disable @typescript-eslint/no-namespace */
+import { encodeMessage, decodeMessage, message, bytes, string } from 'protons-runtime';
+export var Record;
+(function (Record) {
+    Record.codec = () => {
+        return message({
+            1: { name: 'key', codec: bytes },
+            2: { name: 'value', codec: bytes },
+            5: { name: 'timeReceived', codec: string }
+        });
     };
-
-    /**
-     * Decodes a Record message from the specified reader or buffer.
-     * @function decode
-     * @memberof Record
-     * @static
-     * @param {$protobuf.Reader|Uint8Array} r Reader or buffer to decode from
-     * @param {number} [l] Message length if known beforehand
-     * @returns {Record} Record
-     * @throws {Error} If the payload is not a reader or valid buffer
-     * @throws {$protobuf.util.ProtocolError} If required fields are missing
-     */
-    Record.decode = function decode(r, l) {
-        if (!(r instanceof $Reader))
-            r = $Reader.create(r);
-        var c = l === undefined ? r.len : r.pos + l, m = new $root.Record();
-        while (r.pos < c) {
-            var t = r.uint32();
-            switch (t >>> 3) {
-            case 1:
-                m.key = r.bytes();
-                break;
-            case 2:
-                m.value = r.bytes();
-                break;
-            case 5:
-                m.timeReceived = r.string();
-                break;
-            default:
-                r.skipType(t & 7);
-                break;
-            }
-        }
-        return m;
+    Record.encode = (obj) => {
+        return encodeMessage(obj, Record.codec());
     };
-
-    /**
-     * Creates a Record message from a plain object. Also converts values to their respective internal types.
-     * @function fromObject
-     * @memberof Record
-     * @static
-     * @param {Object.<string,*>} d Plain object
-     * @returns {Record} Record
-     */
-    Record.fromObject = function fromObject(d) {
-        if (d instanceof $root.Record)
-            return d;
-        var m = new $root.Record();
-        if (d.key != null) {
-            if (typeof d.key === "string")
-                $util.base64.decode(d.key, m.key = $util.newBuffer($util.base64.length(d.key)), 0);
-            else if (d.key.length)
-                m.key = d.key;
-        }
-        if (d.value != null) {
-            if (typeof d.value === "string")
-                $util.base64.decode(d.value, m.value = $util.newBuffer($util.base64.length(d.value)), 0);
-            else if (d.value.length)
-                m.value = d.value;
-        }
-        if (d.timeReceived != null) {
-            m.timeReceived = String(d.timeReceived);
-        }
-        return m;
+    Record.decode = (buf) => {
+        return decodeMessage(buf, Record.codec());
     };
-
-    /**
-     * Creates a plain object from a Record message. Also converts values to other types if specified.
-     * @function toObject
-     * @memberof Record
-     * @static
-     * @param {Record} m Record
-     * @param {$protobuf.IConversionOptions} [o] Conversion options
-     * @returns {Object.<string,*>} Plain object
-     */
-    Record.toObject = function toObject(m, o) {
-        if (!o)
-            o = {};
-        var d = {};
-        if (o.defaults) {
-            if (o.bytes === String)
-                d.key = "";
-            else {
-                d.key = [];
-                if (o.bytes !== Array)
-                    d.key = $util.newBuffer(d.key);
-            }
-            if (o.bytes === String)
-                d.value = "";
-            else {
-                d.value = [];
-                if (o.bytes !== Array)
-                    d.value = $util.newBuffer(d.value);
-            }
-            d.timeReceived = "";
-        }
-        if (m.key != null && m.hasOwnProperty("key")) {
-            d.key = o.bytes === String ? $util.base64.encode(m.key, 0, m.key.length) : o.bytes === Array ? Array.prototype.slice.call(m.key) : m.key;
-        }
-        if (m.value != null && m.hasOwnProperty("value")) {
-            d.value = o.bytes === String ? $util.base64.encode(m.value, 0, m.value.length) : o.bytes === Array ? Array.prototype.slice.call(m.value) : m.value;
-        }
-        if (m.timeReceived != null && m.hasOwnProperty("timeReceived")) {
-            d.timeReceived = m.timeReceived;
-        }
-        return d;
-    };
-
-    /**
-     * Converts this Record to JSON.
-     * @function toJSON
-     * @memberof Record
-     * @instance
-     * @returns {Object.<string,*>} JSON object
-     */
-    Record.prototype.toJSON = function toJSON() {
-        return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-    };
-
-    return Record;
-})();
-
-export { $root as default };
+})(Record || (Record = {}));
+//# sourceMappingURL=record.js.map

package/dist/src/record.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"record.js","sourceRoot":"","sources":["../../src/record.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,oDAAoD;AAEpD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAStF,MAAM,KAAW,MAAM,CAgBtB;AAhBD,WAAiB,MAAM;IACR,YAAK,GAAG,GAAkB,EAAE;QACvC,OAAO,OAAO,CAAS;YACrB,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE;YAChC,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE;YAClC,CAAC,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE;SAC3C,CAAC,CAAA;IACJ,CAAC,CAAA;IAEY,aAAM,GAAG,CAAC,GAAW,EAAc,EAAE;QAChD,OAAO,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;IAC3C,CAAC,CAAA;IAEY,aAAM,GAAG,CAAC,GAAe,EAAU,EAAE;QAChD,OAAO,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;IAC3C,CAAC,CAAA;AACH,CAAC,EAhBgB,MAAM,KAAN,MAAM,QAgBtB"}

package/dist/src/selectors.d.ts

@@ -3,14 +3,5 @@ import type { Selectors } from '@libp2p/interfaces/dht';
  * Select the best record out of the given records
  */
 export declare function bestRecord(selectors: Selectors, k: Uint8Array, records: Uint8Array[]): number;
-/**
- * Best record selector, for public key records.
- * Simply returns the first record, as all valid public key
- * records are equal
- */
-declare function publickKey(k: Uint8Array, records: Uint8Array[]): number;
-export declare const selectors: {
-    publickKey: typeof publickKey;
-};
-export {};
+export declare const selectors: Selectors;
 //# sourceMappingURL=selectors.d.ts.map

package/dist/src/selectors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selectors.d.ts","sourceRoot":"","sources":["../../src/selectors.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAEvD;;GAEG;AACH,wBAAgB,UAAU,CAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,UA6BrF;AAED;;;;GAIG;AACH,iBAAS,UAAU,CAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,UAExD;AAED,eAAO,MAAM,SAAS;;CAErB,CAAA"}
+{"version":3,"file":"selectors.d.ts","sourceRoot":"","sources":["../../src/selectors.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAEvD;;GAEG;AACH,wBAAgB,UAAU,CAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,UA6BrF;AAWD,eAAO,MAAM,SAAS,EAAE,SAEvB,CAAA"}

package/dist/src/selectors.js

@@ -1,4 +1,4 @@
-import errcode from 'err-code';
+import errCode from 'err-code';
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
 /**
  * Select the best record out of the given records
@@ -6,18 +6,18 @@ import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
 export function bestRecord(selectors, k, records) {
     if (records.length === 0) {
         const errMsg = 'No records given';
-        throw errcode(new Error(errMsg), 'ERR_NO_RECORDS_RECEIVED');
+        throw errCode(new Error(errMsg), 'ERR_NO_RECORDS_RECEIVED');
     }
     const kStr = uint8ArrayToString(k);
     const parts = kStr.split('/');
     if (parts.length < 3) {
         const errMsg = 'Record key does not have a selector function';
-        throw errcode(new Error(errMsg), 'ERR_NO_SELECTOR_FUNCTION_FOR_RECORD_KEY');
+        throw errCode(new Error(errMsg), 'ERR_NO_SELECTOR_FUNCTION_FOR_RECORD_KEY');
     }
     const selector = selectors[parts[1].toString()];
     if (selector == null) {
         const errMsg = `Unrecognized key prefix: ${parts[1]}`;
-        throw errcode(new Error(errMsg), 'ERR_UNRECOGNIZED_KEY_PREFIX');
+        throw errCode(new Error(errMsg), 'ERR_UNRECOGNIZED_KEY_PREFIX');
     }
     if (records.length === 1) {
         return 0;
@@ -33,6 +33,6 @@ function publickKey(k, records) {
     return 0;
 }
 export const selectors = {
-    publickKey
+    pk: publickKey
 };
 //# sourceMappingURL=selectors.js.map

package/dist/src/selectors.js.map

@@ -1 +1 @@
-{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../src/selectors.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAA;AAC9B,OAAO,EAAE,QAAQ,IAAI,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAGtE;;GAEG;AACH,MAAM,UAAU,UAAU,CAAE,SAAoB,EAAE,CAAa,EAAE,OAAqB;IACpF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,MAAM,MAAM,GAAG,kBAAkB,CAAA;QAEjC,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,yBAAyB,CAAC,CAAA;KAC5D;IAED,MAAM,IAAI,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAA;IAClC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAE7B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,MAAM,MAAM,GAAG,8CAA8C,CAAA;QAE7D,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,yCAAyC,CAAC,CAAA;KAC5E;IAED,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IAE/C,IAAI,QAAQ,IAAI,IAAI,EAAE;QACpB,MAAM,MAAM,GAAG,4BAA4B,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;QAErD,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,6BAA6B,CAAC,CAAA;KAChE;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,OAAO,CAAC,CAAA;KACT;IAED,OAAO,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;AAC7B,CAAC;AAED;;;;GAIG;AACH,SAAS,UAAU,CAAE,CAAa,EAAE,OAAqB;IACvD,OAAO,CAAC,CAAA;AACV,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,UAAU;CACX,CAAA"}
+{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../src/selectors.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAA;AAC9B,OAAO,EAAE,QAAQ,IAAI,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAGtE;;GAEG;AACH,MAAM,UAAU,UAAU,CAAE,SAAoB,EAAE,CAAa,EAAE,OAAqB;IACpF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,MAAM,MAAM,GAAG,kBAAkB,CAAA;QAEjC,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,yBAAyB,CAAC,CAAA;KAC5D;IAED,MAAM,IAAI,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAA;IAClC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAE7B,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,MAAM,MAAM,GAAG,8CAA8C,CAAA;QAE7D,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,yCAAyC,CAAC,CAAA;KAC5E;IAED,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IAE/C,IAAI,QAAQ,IAAI,IAAI,EAAE;QACpB,MAAM,MAAM,GAAG,4BAA4B,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;QAErD,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,6BAA6B,CAAC,CAAA;KAChE;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,OAAO,CAAC,CAAA;KACT;IAED,OAAO,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;AAC7B,CAAC;AAED;;;;GAIG;AACH,SAAS,UAAU,CAAE,CAAa,EAAE,OAAqB;IACvD,OAAO,CAAC,CAAA;AACV,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAc;IAClC,EAAE,EAAE,UAAU;CACf,CAAA"}

package/dist/src/validators.d.ts

@@ -6,10 +6,5 @@ import type { Validators } from '@libp2p/interfaces/dht';
  * If verification fails the returned Promise will reject with the error.
  */
 export declare function verifyRecord(validators: Validators, record: Libp2pRecord): Promise<void> | undefined;
-export declare const validators: {
-    publicKey: {
-        func: (key: Uint8Array, publicKey: Uint8Array) => Promise<void>;
-        sign: boolean;
-    };
-};
+export declare const validators: Validators;
 //# sourceMappingURL=validators.d.ts.map

package/dist/src/validators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../src/validators.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAIxD;;;;GAIG;AACH,wBAAgB,YAAY,CAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,6BAmBzE;AAwCD,eAAO,MAAM,UAAU;;oBA7BqB,UAAU,aAAa,UAAU;;;CA+B5E,CAAA"}
+{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../src/validators.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAIxD;;;;GAIG;AACH,wBAAgB,YAAY,CAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,6BAmBzE;AAmCD,eAAO,MAAM,UAAU,EAAE,UAExB,CAAA"}

package/dist/src/validators.js

@@ -1,4 +1,4 @@
-import errcode from 'err-code';
+import errCode from 'err-code';
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
 import { sha256 } from 'multiformats/hashes/sha2';
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals';
@@ -18,9 +18,9 @@ export function verifyRecord(validators, record) {
     const validator = validators[parts[1].toString()];
     if (validator == null) {
         const errMsg = 'Invalid record keytype';
-        throw errcode(new Error(errMsg), 'ERR_INVALID_RECORD_KEY_TYPE');
+        throw errCode(new Error(errMsg), 'ERR_INVALID_RECORD_KEY_TYPE');
     }
-    return validator.func(key, record.value);
+    return validator(key, record.value);
 }
 /**
  * Validator for public key records.
@@ -33,26 +33,22 @@ export function verifyRecord(validators, record) {
  */
 const validatePublicKeyRecord = async (key, publicKey) => {
     if (!(key instanceof Uint8Array)) {
-        throw errcode(new Error('"key" must be a Uint8Array'), 'ERR_INVALID_RECORD_KEY_NOT_BUFFER');
+        throw errCode(new Error('"key" must be a Uint8Array'), 'ERR_INVALID_RECORD_KEY_NOT_BUFFER');
     }
     if (key.byteLength < 5) {
-        throw errcode(new Error('invalid public key record'), 'ERR_INVALID_RECORD_KEY_TOO_SHORT');
+        throw errCode(new Error('invalid public key record'), 'ERR_INVALID_RECORD_KEY_TOO_SHORT');
     }
     const prefix = uint8ArrayToString(key.subarray(0, 4));
     if (prefix !== '/pk/') {
-        throw errcode(new Error('key was not prefixed with /pk/'), 'ERR_INVALID_RECORD_KEY_BAD_PREFIX');
+        throw errCode(new Error('key was not prefixed with /pk/'), 'ERR_INVALID_RECORD_KEY_BAD_PREFIX');
     }
     const keyhash = key.slice(4);
     const publicKeyHash = await sha256.digest(publicKey);
     if (!uint8ArrayEquals(keyhash, publicKeyHash.bytes)) {
-        throw errcode(new Error('public key does not match passed in key'), 'ERR_INVALID_RECORD_HASH_MISMATCH');
+        throw errCode(new Error('public key does not match passed in key'), 'ERR_INVALID_RECORD_HASH_MISMATCH');
     }
 };
-const publicKey = {
-    func: validatePublicKeyRecord,
-    sign: false
-};
 export const validators = {
-    publicKey
+    pk: validatePublicKeyRecord
 };
 //# sourceMappingURL=validators.js.map

package/dist/src/validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../src/validators.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAA;AAC9B,OAAO,EAAE,QAAQ,IAAI,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAGtE,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,MAAM,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE/D;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAE,UAAsB,EAAE,MAAoB;IACxE,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;IACtB,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IACzC,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAElC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,yBAAyB;QACzB,OAAM;KACP;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IAEjD,IAAI,SAAS,IAAI,IAAI,EAAE;QACrB,MAAM,MAAM,GAAG,wBAAwB,CAAA;QAEvC,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,6BAA6B,CAAC,CAAA;KAChE;IAED,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;AAC1C,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,uBAAuB,GAAG,KAAK,EAAE,GAAe,EAAE,SAAqB,EAAE,EAAE;IAC/E,IAAI,CAAC,CAAC,GAAG,YAAY,UAAU,CAAC,EAAE;QAChC,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,EAAE,mCAAmC,CAAC,CAAA;KAC5F;IAED,IAAI,GAAG,CAAC,UAAU,GAAG,CAAC,EAAE;QACtB,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,EAAE,kCAAkC,CAAC,CAAA;KAC1F;IAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAErD,IAAI,MAAM,KAAK,MAAM,EAAE;QACrB,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,EAAE,mCAAmC,CAAC,CAAA;KAChG;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAE5B,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IAEpD,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE;QACnD,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,yCAAyC,CAAC,EAAE,kCAAkC,CAAC,CAAA;KACxG;AACH,CAAC,CAAA;AAED,MAAM,SAAS,GAAG;IAChB,IAAI,EAAE,uBAAuB;IAC7B,IAAI,EAAE,KAAK;CACZ,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,SAAS;CACV,CAAA"}
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../src/validators.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAA;AAC9B,OAAO,EAAE,QAAQ,IAAI,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAGtE,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,MAAM,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE/D;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAE,UAAsB,EAAE,MAAoB;IACxE,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;IACtB,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;IACzC,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAElC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,yBAAyB;QACzB,OAAM;KACP;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;IAEjD,IAAI,SAAS,IAAI,IAAI,EAAE;QACrB,MAAM,MAAM,GAAG,wBAAwB,CAAA;QAEvC,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,6BAA6B,CAAC,CAAA;KAChE;IAED,OAAO,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;AACrC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,uBAAuB,GAAG,KAAK,EAAE,GAAe,EAAE,SAAqB,EAAE,EAAE;IAC/E,IAAI,CAAC,CAAC,GAAG,YAAY,UAAU,CAAC,EAAE;QAChC,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,EAAE,mCAAmC,CAAC,CAAA;KAC5F;IAED,IAAI,GAAG,CAAC,UAAU,GAAG,CAAC,EAAE;QACtB,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,EAAE,kCAAkC,CAAC,CAAA;KAC1F;IAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAErD,IAAI,MAAM,KAAK,MAAM,EAAE;QACrB,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,EAAE,mCAAmC,CAAC,CAAA;KAChG;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAE5B,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IAEpD,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE;QACnD,MAAM,OAAO,CAAC,IAAI,KAAK,CAAC,yCAAyC,CAAC,EAAE,kCAAkC,CAAC,CAAA;KACxG;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAe;IACpC,EAAE,EAAE,uBAAuB;CAC5B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/record",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "libp2p record implementation",
   "author": "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
   "license": "Apache-2.0 OR MIT",
@@ -145,30 +145,29 @@
     ]
   },
   "scripts": {
+    "clean": "aegir clean",
     "lint": "aegir lint",
-    "pretest": "npm run build",
-    "test": "aegir test -f ./dist/test",
-    "test:node": "npm run test -- -t node",
-    "test:chrome": "npm run test -- -t browser",
-    "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",
-    "build": "tsc",
-    "postbuild": "npm run build:copy-proto-files",
-    "generate:proto": "pbjs -t static-module -w es6 -r libp2p-record --force-number --no-verify --no-delimited --no-create --no-beautify --no-defaults --lint eslint-disable -o src/record/record.js ./src/record/record.proto",
-    "generate:proto-types": "pbts -o src/record/record.d.ts src/record/record.js",
-    "build:copy-proto-files": "cp src/record* dist/src",
-    "release": "semantic-release"
+    "dep-check": "aegir dep-check",
+    "test": "aegir test",
+    "test:node": "aegir test -t node",
+    "test:chrome": "aegir test -t browser",
+    "test:chrome-webworker": "aegir test -t webworker",
+    "test:firefox": "aegir test -t browser -- --browser firefox",
+    "test:firefox-webworker": "aegir test -t webworker -- --browser firefox",
+    "build": "aegir build",
+    "generate": "protons ./src/record.proto",
+    "release": "aegir release"
   },
   "dependencies": {
+    "@libp2p/interfaces": "^1.3.21",
     "err-code": "^3.0.1",
     "multiformats": "^9.4.5",
-    "protobufjs": "^6.11.2",
+    "protons-runtime": "^1.0.2",
     "uint8arrays": "^3.0.0"
   },
   "devDependencies": {
-    "@libp2p/crypto": "^0.22.7",
-    "@libp2p/interfaces": "^1.3.3",
-    "aegir": "^36.1.3"
+    "@libp2p/crypto": "^0.22.10",
+    "aegir": "^37.0.13",
+    "protons": "^3.0.2"
   }
 }

package/src/index.ts

@@ -1,15 +1,14 @@
 import {
-  IRecord,
-  Record as PBRecord
+  Record
 } from './record.js'
 import * as utils from './utils.js'
 
 export class Libp2pRecord {
   public key: Uint8Array
   public value: Uint8Array
-  public timeReceived?: Date
+  public timeReceived: Date
 
-  constructor (key: Uint8Array, value: Uint8Array, timeReceived?: Date) {
+  constructor (key: Uint8Array, value: Uint8Array, timeReceived: Date) {
     if (!(key instanceof Uint8Array)) {
       throw new Error('key must be a Uint8Array')
     }
@@ -24,7 +23,7 @@ export class Libp2pRecord {
   }
 
   serialize () {
-    return PBRecord.encode(this.prepareSerialize()).finish()
+    return Record.encode(this.prepareSerialize())
   }
 
   /**
@@ -34,7 +33,7 @@ export class Libp2pRecord {
     return {
       key: this.key,
       value: this.value,
-      timeReceived: this.timeReceived != null ? utils.toRFC3339(this.timeReceived) : undefined
+      timeReceived: utils.toRFC3339(this.timeReceived)
     }
   }
 
@@ -42,23 +41,16 @@ export class Libp2pRecord {
    * Decode a protobuf encoded record
    */
   static deserialize (raw: Uint8Array) {
-    const message = PBRecord.decode(raw)
-    return Libp2pRecord.fromDeserialized(PBRecord.toObject(message, {
-      defaults: false,
-      arrays: true,
-      longs: Number,
-      objects: false
-    }))
+    const rec = Record.decode(raw)
+
+    return new Libp2pRecord(rec.key, rec.value, new Date(rec.timeReceived))
   }
 
   /**
    * Create a record from the raw object returned from the protobuf library
    */
-  static fromDeserialized (obj: IRecord) {
-    let recvtime
-    if (obj.timeReceived != null) {
-      recvtime = utils.parseRFC3339(obj.timeReceived)
-    }
+  static fromDeserialized (obj: Record) {
+    const recvtime = utils.parseRFC3339(obj.timeReceived)
 
     if (obj.key == null) {
       throw new Error('key missing from deserialized object')

package/src/record.ts

@@ -0,0 +1,29 @@
+/* eslint-disable import/export */
+/* eslint-disable @typescript-eslint/no-namespace */
+
+import { encodeMessage, decodeMessage, message, bytes, string } from 'protons-runtime'
+import type { Codec } from 'protons-runtime'
+
+export interface Record {
+  key: Uint8Array
+  value: Uint8Array
+  timeReceived: string
+}
+
+export namespace Record {
+  export const codec = (): Codec<Record> => {
+    return message<Record>({
+      1: { name: 'key', codec: bytes },
+      2: { name: 'value', codec: bytes },
+      5: { name: 'timeReceived', codec: string }
+    })
+  }
+
+  export const encode = (obj: Record): Uint8Array => {
+    return encodeMessage(obj, Record.codec())
+  }
+
+  export const decode = (buf: Uint8Array): Record => {
+    return decodeMessage(buf, Record.codec())
+  }
+}

package/src/selectors.ts

@@ -1,4 +1,4 @@
-import errcode from 'err-code'
+import errCode from 'err-code'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import type { Selectors } from '@libp2p/interfaces/dht'
 
@@ -9,7 +9,7 @@ export function bestRecord (selectors: Selectors, k: Uint8Array, records: Uint8A
   if (records.length === 0) {
     const errMsg = 'No records given'
 
-    throw errcode(new Error(errMsg), 'ERR_NO_RECORDS_RECEIVED')
+    throw errCode(new Error(errMsg), 'ERR_NO_RECORDS_RECEIVED')
   }
 
   const kStr = uint8ArrayToString(k)
@@ -18,7 +18,7 @@ export function bestRecord (selectors: Selectors, k: Uint8Array, records: Uint8A
   if (parts.length < 3) {
     const errMsg = 'Record key does not have a selector function'
 
-    throw errcode(new Error(errMsg), 'ERR_NO_SELECTOR_FUNCTION_FOR_RECORD_KEY')
+    throw errCode(new Error(errMsg), 'ERR_NO_SELECTOR_FUNCTION_FOR_RECORD_KEY')
   }
 
   const selector = selectors[parts[1].toString()]
@@ -26,7 +26,7 @@ export function bestRecord (selectors: Selectors, k: Uint8Array, records: Uint8A
   if (selector == null) {
     const errMsg = `Unrecognized key prefix: ${parts[1]}`
 
-    throw errcode(new Error(errMsg), 'ERR_UNRECOGNIZED_KEY_PREFIX')
+    throw errCode(new Error(errMsg), 'ERR_UNRECOGNIZED_KEY_PREFIX')
   }
 
   if (records.length === 1) {
@@ -45,6 +45,6 @@ function publickKey (k: Uint8Array, records: Uint8Array[]) {
   return 0
 }
 
-export const selectors = {
-  publickKey
+export const selectors: Selectors = {
+  pk: publickKey
 }

package/src/validators.ts

@@ -1,4 +1,4 @@
-import errcode from 'err-code'
+import errCode from 'err-code'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import type { Libp2pRecord } from './index.js'
 import type { Validators } from '@libp2p/interfaces/dht'
@@ -25,10 +25,10 @@ export function verifyRecord (validators: Validators, record: Libp2pRecord) {
   if (validator == null) {
     const errMsg = 'Invalid record keytype'
 
-    throw errcode(new Error(errMsg), 'ERR_INVALID_RECORD_KEY_TYPE')
+    throw errCode(new Error(errMsg), 'ERR_INVALID_RECORD_KEY_TYPE')
   }
 
-  return validator.func(key, record.value)
+  return validator(key, record.value)
 }
 
 /**
@@ -42,17 +42,17 @@ export function verifyRecord (validators: Validators, record: Libp2pRecord) {
  */
 const validatePublicKeyRecord = async (key: Uint8Array, publicKey: Uint8Array) => {
   if (!(key instanceof Uint8Array)) {
-    throw errcode(new Error('"key" must be a Uint8Array'), 'ERR_INVALID_RECORD_KEY_NOT_BUFFER')
+    throw errCode(new Error('"key" must be a Uint8Array'), 'ERR_INVALID_RECORD_KEY_NOT_BUFFER')
   }
 
   if (key.byteLength < 5) {
-    throw errcode(new Error('invalid public key record'), 'ERR_INVALID_RECORD_KEY_TOO_SHORT')
+    throw errCode(new Error('invalid public key record'), 'ERR_INVALID_RECORD_KEY_TOO_SHORT')
   }
 
   const prefix = uint8ArrayToString(key.subarray(0, 4))
 
   if (prefix !== '/pk/') {
-    throw errcode(new Error('key was not prefixed with /pk/'), 'ERR_INVALID_RECORD_KEY_BAD_PREFIX')
+    throw errCode(new Error('key was not prefixed with /pk/'), 'ERR_INVALID_RECORD_KEY_BAD_PREFIX')
   }
 
   const keyhash = key.slice(4)
@@ -60,15 +60,10 @@ const validatePublicKeyRecord = async (key: Uint8Array, publicKey: Uint8Array) =
   const publicKeyHash = await sha256.digest(publicKey)
 
   if (!uint8ArrayEquals(keyhash, publicKeyHash.bytes)) {
-    throw errcode(new Error('public key does not match passed in key'), 'ERR_INVALID_RECORD_HASH_MISMATCH')
+    throw errCode(new Error('public key does not match passed in key'), 'ERR_INVALID_RECORD_HASH_MISMATCH')
   }
 }
 
-const publicKey = {
-  func: validatePublicKeyRecord,
-  sign: false
-}
-
-export const validators = {
-  publicKey
+export const validators: Validators = {
+  pk: validatePublicKeyRecord
 }

package/dist/src/record.proto

@@ -1,20 +0,0 @@
-syntax = "proto3";
-
-// Record represents a dht record that contains a value
-// for a key value pair
-message Record {
-  // The key that references this record
-  bytes key = 1;
-
-  // The actual value this record is storing
-  bytes value = 2;
-
-  // Note: These fields were removed from the Record message
-  // hash of the authors public key
-  // optional bytes author = 3;
-  // A PKI signature for the key+value+author
-  // optional bytes signature = 4;
-
-  // Time the record was received, set by receiver
-  string timeReceived = 5;
-}

package/src/record.d.ts

@@ -1,71 +0,0 @@
-import * as $protobuf from "protobufjs";
-/** Properties of a Record. */
-export interface IRecord {
-
-    /** Record key */
-    key?: (Uint8Array|null);
-
-    /** Record value */
-    value?: (Uint8Array|null);
-
-    /** Record timeReceived */
-    timeReceived?: (string|null);
-}
-
-/** Represents a Record. */
-export class Record implements IRecord {
-
-    /**
-     * Constructs a new Record.
-     * @param [p] Properties to set
-     */
-    constructor(p?: IRecord);
-
-    /** Record key. */
-    public key: Uint8Array;
-
-    /** Record value. */
-    public value: Uint8Array;
-
-    /** Record timeReceived. */
-    public timeReceived: string;
-
-    /**
-     * Encodes the specified Record message. Does not implicitly {@link Record.verify|verify} messages.
-     * @param m Record message or plain object to encode
-     * @param [w] Writer to encode to
-     * @returns Writer
-     */
-    public static encode(m: IRecord, w?: $protobuf.Writer): $protobuf.Writer;
-
-    /**
-     * Decodes a Record message from the specified reader or buffer.
-     * @param r Reader or buffer to decode from
-     * @param [l] Message length if known beforehand
-     * @returns Record
-     * @throws {Error} If the payload is not a reader or valid buffer
-     * @throws {$protobuf.util.ProtocolError} If required fields are missing
-     */
-    public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): Record;
-
-    /**
-     * Creates a Record message from a plain object. Also converts values to their respective internal types.
-     * @param d Plain object
-     * @returns Record
-     */
-    public static fromObject(d: { [k: string]: any }): Record;
-
-    /**
-     * Creates a plain object from a Record message. Also converts values to other types if specified.
-     * @param m Record
-     * @param [o] Conversion options
-     * @returns Plain object
-     */
-    public static toObject(m: Record, o?: $protobuf.IConversionOptions): { [k: string]: any };
-
-    /**
-     * Converts this Record to JSON.
-     * @returns JSON object
-     */
-    public toJSON(): { [k: string]: any };
-}

package/src/record.js

@@ -1,202 +0,0 @@
-/*eslint-disable*/
-import $protobuf from "protobufjs/minimal.js";
-
-// Common aliases
-const $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util;
-
-// Exported root namespace
-const $root = $protobuf.roots["libp2p-record"] || ($protobuf.roots["libp2p-record"] = {});
-
-export const Record = $root.Record = (() => {
-
-    /**
-     * Properties of a Record.
-     * @exports IRecord
-     * @interface IRecord
-     * @property {Uint8Array|null} [key] Record key
-     * @property {Uint8Array|null} [value] Record value
-     * @property {string|null} [timeReceived] Record timeReceived
-     */
-
-    /**
-     * Constructs a new Record.
-     * @exports Record
-     * @classdesc Represents a Record.
-     * @implements IRecord
-     * @constructor
-     * @param {IRecord=} [p] Properties to set
-     */
-    function Record(p) {
-        if (p)
-            for (var ks = Object.keys(p), i = 0; i < ks.length; ++i)
-                if (p[ks[i]] != null)
-                    this[ks[i]] = p[ks[i]];
-    }
-
-    /**
-     * Record key.
-     * @member {Uint8Array} key
-     * @memberof Record
-     * @instance
-     */
-    Record.prototype.key = $util.newBuffer([]);
-
-    /**
-     * Record value.
-     * @member {Uint8Array} value
-     * @memberof Record
-     * @instance
-     */
-    Record.prototype.value = $util.newBuffer([]);
-
-    /**
-     * Record timeReceived.
-     * @member {string} timeReceived
-     * @memberof Record
-     * @instance
-     */
-    Record.prototype.timeReceived = "";
-
-    /**
-     * Encodes the specified Record message. Does not implicitly {@link Record.verify|verify} messages.
-     * @function encode
-     * @memberof Record
-     * @static
-     * @param {IRecord} m Record message or plain object to encode
-     * @param {$protobuf.Writer} [w] Writer to encode to
-     * @returns {$protobuf.Writer} Writer
-     */
-    Record.encode = function encode(m, w) {
-        if (!w)
-            w = $Writer.create();
-        if (m.key != null && Object.hasOwnProperty.call(m, "key"))
-            w.uint32(10).bytes(m.key);
-        if (m.value != null && Object.hasOwnProperty.call(m, "value"))
-            w.uint32(18).bytes(m.value);
-        if (m.timeReceived != null && Object.hasOwnProperty.call(m, "timeReceived"))
-            w.uint32(42).string(m.timeReceived);
-        return w;
-    };
-
-    /**
-     * Decodes a Record message from the specified reader or buffer.
-     * @function decode
-     * @memberof Record
-     * @static
-     * @param {$protobuf.Reader|Uint8Array} r Reader or buffer to decode from
-     * @param {number} [l] Message length if known beforehand
-     * @returns {Record} Record
-     * @throws {Error} If the payload is not a reader or valid buffer
-     * @throws {$protobuf.util.ProtocolError} If required fields are missing
-     */
-    Record.decode = function decode(r, l) {
-        if (!(r instanceof $Reader))
-            r = $Reader.create(r);
-        var c = l === undefined ? r.len : r.pos + l, m = new $root.Record();
-        while (r.pos < c) {
-            var t = r.uint32();
-            switch (t >>> 3) {
-            case 1:
-                m.key = r.bytes();
-                break;
-            case 2:
-                m.value = r.bytes();
-                break;
-            case 5:
-                m.timeReceived = r.string();
-                break;
-            default:
-                r.skipType(t & 7);
-                break;
-            }
-        }
-        return m;
-    };
-
-    /**
-     * Creates a Record message from a plain object. Also converts values to their respective internal types.
-     * @function fromObject
-     * @memberof Record
-     * @static
-     * @param {Object.<string,*>} d Plain object
-     * @returns {Record} Record
-     */
-    Record.fromObject = function fromObject(d) {
-        if (d instanceof $root.Record)
-            return d;
-        var m = new $root.Record();
-        if (d.key != null) {
-            if (typeof d.key === "string")
-                $util.base64.decode(d.key, m.key = $util.newBuffer($util.base64.length(d.key)), 0);
-            else if (d.key.length)
-                m.key = d.key;
-        }
-        if (d.value != null) {
-            if (typeof d.value === "string")
-                $util.base64.decode(d.value, m.value = $util.newBuffer($util.base64.length(d.value)), 0);
-            else if (d.value.length)
-                m.value = d.value;
-        }
-        if (d.timeReceived != null) {
-            m.timeReceived = String(d.timeReceived);
-        }
-        return m;
-    };
-
-    /**
-     * Creates a plain object from a Record message. Also converts values to other types if specified.
-     * @function toObject
-     * @memberof Record
-     * @static
-     * @param {Record} m Record
-     * @param {$protobuf.IConversionOptions} [o] Conversion options
-     * @returns {Object.<string,*>} Plain object
-     */
-    Record.toObject = function toObject(m, o) {
-        if (!o)
-            o = {};
-        var d = {};
-        if (o.defaults) {
-            if (o.bytes === String)
-                d.key = "";
-            else {
-                d.key = [];
-                if (o.bytes !== Array)
-                    d.key = $util.newBuffer(d.key);
-            }
-            if (o.bytes === String)
-                d.value = "";
-            else {
-                d.value = [];
-                if (o.bytes !== Array)
-                    d.value = $util.newBuffer(d.value);
-            }
-            d.timeReceived = "";
-        }
-        if (m.key != null && m.hasOwnProperty("key")) {
-            d.key = o.bytes === String ? $util.base64.encode(m.key, 0, m.key.length) : o.bytes === Array ? Array.prototype.slice.call(m.key) : m.key;
-        }
-        if (m.value != null && m.hasOwnProperty("value")) {
-            d.value = o.bytes === String ? $util.base64.encode(m.value, 0, m.value.length) : o.bytes === Array ? Array.prototype.slice.call(m.value) : m.value;
-        }
-        if (m.timeReceived != null && m.hasOwnProperty("timeReceived")) {
-            d.timeReceived = m.timeReceived;
-        }
-        return d;
-    };
-
-    /**
-     * Converts this Record to JSON.
-     * @function toJSON
-     * @memberof Record
-     * @instance
-     * @returns {Object.<string,*>} JSON object
-     */
-    Record.prototype.toJSON = function toJSON() {
-        return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-    };
-
-    return Record;
-})();
-
-export { $root as default };