@libp2p/mplex 8.0.2 → 8.0.4-05abd49f

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

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/stream.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAW7C,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAA;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;IAC7B,IAAI,CAAC,EAAE,WAAW,GAAG,UAAU,CAAA;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,wBAAgB,YAAY,CAAE,OAAO,EAAE,OAAO,GAAG,WAAW,CA8N3D"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,KAAK,kBAAkB,EAAE,MAAM,uCAAuC,CAAA;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAI/C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAEjD,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAA;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,CAAA;IAC7B,IAAI,CAAC,EAAE,WAAW,GAAG,UAAU,CAAA;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,eAAgB,SAAQ,kBAAkB;IAClD,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAA;CAC7B;AAED,cAAM,WAAY,SAAQ,cAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAwB;IAC7C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAwB;gBAEjC,IAAI,EAAE,eAAe;IASlC,aAAa,IAAK,IAAI;IAItB,QAAQ,CAAE,IAAI,EAAE,cAAc,GAAG,IAAI;IAIrC,SAAS,IAAK,IAAI;IAIlB,cAAc,IAAK,IAAI;IAIvB,aAAa,IAAK,IAAI;CAGvB;AAED,wBAAgB,YAAY,CAAE,OAAO,EAAE,OAAO,GAAG,WAAW,CAY3D"}

package/dist/src/stream.js

@@ -1,198 +1,46 @@
-import { CodeError } from '@libp2p/interfaces/errors';
-import { logger } from '@libp2p/logger';
-import { abortableSource } from 'abortable-iterator';
-import { anySignal } from 'any-signal';
-import { pushable } from 'it-pushable';
+import { AbstractStream } from '@libp2p/interface/stream-muxer/stream';
 import { Uint8ArrayList } from 'uint8arraylist';
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
 import { MAX_MSG_SIZE } from './decode.js';
 import { InitiatorMessageTypes, ReceiverMessageTypes } from './message-types.js';
-const log = logger('libp2p:mplex:stream');
-const ERR_STREAM_RESET = 'ERR_STREAM_RESET';
-const ERR_STREAM_ABORT = 'ERR_STREAM_ABORT';
-const ERR_SINK_ENDED = 'ERR_SINK_ENDED';
-const ERR_DOUBLE_SINK = 'ERR_DOUBLE_SINK';
+class MplexStream extends AbstractStream {
+    name;
+    streamId;
+    send;
+    types;
+    constructor(init) {
+        super(init);
+        this.types = init.direction === 'outbound' ? InitiatorMessageTypes : ReceiverMessageTypes;
+        this.send = init.send;
+        this.name = init.name;
+        this.streamId = init.streamId;
+    }
+    sendNewStream() {
+        this.send({ id: this.streamId, type: InitiatorMessageTypes.NEW_STREAM, data: new Uint8ArrayList(uint8ArrayFromString(this.name)) });
+    }
+    sendData(data) {
+        this.send({ id: this.streamId, type: this.types.MESSAGE, data });
+    }
+    sendReset() {
+        this.send({ id: this.streamId, type: this.types.RESET });
+    }
+    sendCloseWrite() {
+        this.send({ id: this.streamId, type: this.types.CLOSE });
+    }
+    sendCloseRead() {
+        // mplex does not support close read, only close write
+    }
+}
 export function createStream(options) {
     const { id, name, send, onEnd, type = 'initiator', maxMsgSize = MAX_MSG_SIZE } = options;
-    const abortController = new AbortController();
-    const resetController = new AbortController();
-    const closeController = new AbortController();
-    const Types = type === 'initiator' ? InitiatorMessageTypes : ReceiverMessageTypes;
-    const externalId = type === 'initiator' ? (`i${id}`) : `r${id}`;
-    const streamName = `${name == null ? id : name}`;
-    let sourceEnded = false;
-    let sinkEnded = false;
-    let sinkSunk = false;
-    let endErr;
-    const timeline = {
-        open: Date.now()
-    };
-    const onSourceEnd = (err) => {
-        if (sourceEnded) {
-            return;
-        }
-        sourceEnded = true;
-        log.trace('%s stream %s source end - err: %o', type, streamName, err);
-        if (err != null && endErr == null) {
-            endErr = err;
-        }
-        if (sinkEnded) {
-            stream.stat.timeline.close = Date.now();
-            if (onEnd != null) {
-                onEnd(endErr);
-            }
-        }
-    };
-    const onSinkEnd = (err) => {
-        if (sinkEnded) {
-            return;
-        }
-        sinkEnded = true;
-        log.trace('%s stream %s sink end - err: %o', type, streamName, err);
-        if (err != null && endErr == null) {
-            endErr = err;
-        }
-        if (sourceEnded) {
-            timeline.close = Date.now();
-            if (onEnd != null) {
-                onEnd(endErr);
-            }
-        }
-    };
-    const streamSource = pushable({
-        onEnd: onSourceEnd
+    return new MplexStream({
+        id: type === 'initiator' ? (`i${id}`) : `r${id}`,
+        streamId: id,
+        name: `${name == null ? id : name}`,
+        direction: type === 'initiator' ? 'outbound' : 'inbound',
+        maxDataSize: maxMsgSize,
+        onEnd,
+        send
     });
-    const stream = {
-        // Close for both Reading and Writing
-        close: () => {
-            log.trace('%s stream %s close', type, streamName);
-            stream.closeRead();
-            stream.closeWrite();
-        },
-        // Close for reading
-        closeRead: () => {
-            log.trace('%s stream %s closeRead', type, streamName);
-            if (sourceEnded) {
-                return;
-            }
-            streamSource.end();
-        },
-        // Close for writing
-        closeWrite: () => {
-            log.trace('%s stream %s closeWrite', type, streamName);
-            if (sinkEnded) {
-                return;
-            }
-            closeController.abort();
-            try {
-                send({ id, type: Types.CLOSE });
-            }
-            catch (err) {
-                log.trace('%s stream %s error sending close', type, name, err);
-            }
-            onSinkEnd();
-        },
-        // Close for reading and writing (local error)
-        abort: (err) => {
-            log.trace('%s stream %s abort', type, streamName, err);
-            // End the source with the passed error
-            streamSource.end(err);
-            abortController.abort();
-            onSinkEnd(err);
-        },
-        // Close immediately for reading and writing (remote error)
-        reset: () => {
-            const err = new CodeError('stream reset', ERR_STREAM_RESET);
-            resetController.abort();
-            streamSource.end(err);
-            onSinkEnd(err);
-        },
-        sink: async (source) => {
-            if (sinkSunk) {
-                throw new CodeError('sink already called on stream', ERR_DOUBLE_SINK);
-            }
-            sinkSunk = true;
-            if (sinkEnded) {
-                throw new CodeError('stream closed for writing', ERR_SINK_ENDED);
-            }
-            const signal = anySignal([
-                abortController.signal,
-                resetController.signal,
-                closeController.signal
-            ]);
-            try {
-                source = abortableSource(source, signal);
-                if (type === 'initiator') { // If initiator, open a new stream
-                    send({ id, type: InitiatorMessageTypes.NEW_STREAM, data: new Uint8ArrayList(uint8ArrayFromString(streamName)) });
-                }
-                for await (let data of source) {
-                    while (data.length > 0) {
-                        if (data.length <= maxMsgSize) {
-                            send({ id, type: Types.MESSAGE, data: data instanceof Uint8Array ? new Uint8ArrayList(data) : data });
-                            break;
-                        }
-                        data = data instanceof Uint8Array ? new Uint8ArrayList(data) : data;
-                        send({ id, type: Types.MESSAGE, data: data.sublist(0, maxMsgSize) });
-                        data.consume(maxMsgSize);
-                    }
-                }
-            }
-            catch (err) {
-                if (err.type === 'aborted' && err.message === 'The operation was aborted') {
-                    if (closeController.signal.aborted) {
-                        return;
-                    }
-                    if (resetController.signal.aborted) {
-                        err.message = 'stream reset';
-                        err.code = ERR_STREAM_RESET;
-                    }
-                    if (abortController.signal.aborted) {
-                        err.message = 'stream aborted';
-                        err.code = ERR_STREAM_ABORT;
-                    }
-                }
-                // Send no more data if this stream was remotely reset
-                if (err.code === ERR_STREAM_RESET) {
-                    log.trace('%s stream %s reset', type, name);
-                }
-                else {
-                    log.trace('%s stream %s error', type, name, err);
-                    try {
-                        send({ id, type: Types.RESET });
-                    }
-                    catch (err) {
-                        log.trace('%s stream %s error sending reset', type, name, err);
-                    }
-                }
-                streamSource.end(err);
-                onSinkEnd(err);
-                return;
-            }
-            finally {
-                signal.clear();
-            }
-            try {
-                send({ id, type: Types.CLOSE });
-            }
-            catch (err) {
-                log.trace('%s stream %s error sending close', type, name, err);
-            }
-            onSinkEnd();
-        },
-        source: streamSource,
-        sourcePush: (data) => {
-            streamSource.push(data);
-        },
-        sourceReadableLength() {
-            return streamSource.readableLength;
-        },
-        stat: {
-            direction: type === 'initiator' ? 'outbound' : 'inbound',
-            timeline
-        },
-        metadata: {},
-        id: externalId
-    };
-    return stream;
 }
 //# sourceMappingURL=stream.js.map

package/dist/src/stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/stream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA2B,MAAM,uCAAuC,CAAA;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAkBhF,MAAM,WAAY,SAAQ,cAAc;IACrB,IAAI,CAAQ;IACZ,QAAQ,CAAQ;IAChB,IAAI,CAAwB;IAC5B,KAAK,CAAwB;IAE9C,YAAa,IAAqB;QAChC,KAAK,CAAC,IAAI,CAAC,CAAA;QAEX,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,oBAAoB,CAAA;QACzF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;QACrB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;IAC/B,CAAC;IAED,aAAa;QACX,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAqB,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAA;IACrI,CAAC;IAED,QAAQ,CAAE,IAAoB;QAC5B,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;IAClE,CAAC;IAED,SAAS;QACP,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAA;IAC1D,CAAC;IAED,cAAc;QACZ,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAA;IAC1D,CAAC;IAED,aAAa;QACX,sDAAsD;IACxD,CAAC;CACF;AAED,MAAM,UAAU,YAAY,CAAE,OAAgB;IAC5C,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,GAAG,WAAW,EAAE,UAAU,GAAG,YAAY,EAAE,GAAG,OAAO,CAAA;IAExF,OAAO,IAAI,WAAW,CAAC;QACrB,EAAE,EAAE,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE;QAChD,QAAQ,EAAE,EAAE;QACZ,IAAI,EAAE,GAAG,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE;QACnC,SAAS,EAAE,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;QACxD,WAAW,EAAE,UAAU;QACvB,KAAK;QACL,IAAI;KACL,CAAC,CAAA;AACJ,CAAC"}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@libp2p/mplex",
-  "version": "8.0.2",
+  "version": "8.0.4-05abd49f",
   "description": "JavaScript implementation of https://github.com/libp2p/mplex",
   "license": "Apache-2.0 OR MIT",
-  "homepage": "https://github.com/libp2p/js-libp2p-mplex#readme",
+  "homepage": "https://github.com/libp2p/js-libp2p/tree/master/packages/stream-multiplexer-mplex#readme",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/libp2p/js-libp2p-mplex.git"
+    "url": "git+https://github.com/libp2p/js-libp2p.git"
   },
   "bugs": {
-    "url": "https://github.com/libp2p/js-libp2p-mplex/issues"
+    "url": "https://github.com/libp2p/js-libp2p/issues"
   },
   "keywords": [
     "IPFS",
@@ -21,10 +21,6 @@
     "muxer",
     "stream"
   ],
-  "engines": {
-    "node": ">=16.0.0",
-    "npm": ">=7.0.0"
-  },
   "type": "module",
   "types": "./dist/src/index.d.ts",
   "files": [
@@ -45,91 +41,6 @@
       "sourceType": "module"
     }
   },
-  "release": {
-    "branches": [
-      "master"
-    ],
-    "plugins": [
-      [
-        "@semantic-release/commit-analyzer",
-        {
-          "preset": "conventionalcommits",
-          "releaseRules": [
-            {
-              "breaking": true,
-              "release": "major"
-            },
-            {
-              "revert": true,
-              "release": "patch"
-            },
-            {
-              "type": "feat",
-              "release": "minor"
-            },
-            {
-              "type": "fix",
-              "release": "patch"
-            },
-            {
-              "type": "docs",
-              "release": "patch"
-            },
-            {
-              "type": "test",
-              "release": "patch"
-            },
-            {
-              "type": "deps",
-              "release": "patch"
-            },
-            {
-              "scope": "no-release",
-              "release": false
-            }
-          ]
-        }
-      ],
-      [
-        "@semantic-release/release-notes-generator",
-        {
-          "preset": "conventionalcommits",
-          "presetConfig": {
-            "types": [
-              {
-                "type": "feat",
-                "section": "Features"
-              },
-              {
-                "type": "fix",
-                "section": "Bug Fixes"
-              },
-              {
-                "type": "chore",
-                "section": "Trivial Changes"
-              },
-              {
-                "type": "docs",
-                "section": "Documentation"
-              },
-              {
-                "type": "deps",
-                "section": "Dependencies"
-              },
-              {
-                "type": "test",
-                "section": "Tests"
-              }
-            ]
-          }
-        }
-      ],
-      "@semantic-release/changelog",
-      "@semantic-release/npm",
-      "@semantic-release/github",
-      "@semantic-release/git"
-    ]
-  },
   "scripts": {
     "clean": "aegir clean",
     "lint": "aegir lint",
@@ -142,37 +53,33 @@
     "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",
-    "docs": "aegir docs"
+    "test:electron-main": "aegir test -t electron-main"
   },
   "dependencies": {
-    "@libp2p/interface-connection": "^5.0.0",
-    "@libp2p/interface-stream-muxer": "^4.0.0",
-    "@libp2p/interfaces": "^3.2.0",
-    "@libp2p/logger": "^2.0.0",
-    "abortable-iterator": "^5.0.0",
-    "any-signal": "^4.0.1",
+    "@libp2p/interface": "0.0.1-05abd49f",
+    "@libp2p/logger": "2.1.1-05abd49f",
+    "abortable-iterator": "^5.0.1",
+    "any-signal": "^4.1.1",
     "benchmark": "^2.1.4",
     "it-batched-bytes": "^2.0.2",
-    "it-pushable": "^3.1.0",
+    "it-pushable": "^3.1.3",
     "it-stream-types": "^2.0.1",
-    "rate-limiter-flexible": "^2.3.9",
-    "uint8arraylist": "^2.1.1",
-    "uint8arrays": "^4.0.2",
+    "rate-limiter-flexible": "^2.3.11",
+    "uint8arraylist": "^2.4.3",
+    "uint8arrays": "^4.0.4",
     "varint": "^6.0.0"
   },
   "devDependencies": {
-    "@libp2p/interface-stream-muxer-compliance-tests": "^7.0.0",
+    "@libp2p/interface-compliance-tests": "3.0.7-05abd49f",
     "@types/varint": "^6.0.0",
-    "aegir": "^39.0.7",
-    "cborg": "^1.8.1",
-    "delay": "^5.0.0",
+    "aegir": "^39.0.10",
+    "cborg": "^2.0.1",
+    "delay": "^6.0.0",
     "iso-random-stream": "^2.0.2",
     "it-all": "^3.0.1",
-    "it-drain": "^3.0.1",
+    "it-drain": "^3.0.2",
     "it-foreach": "^2.0.2",
-    "it-map": "^3.0.1",
+    "it-map": "^3.0.3",
     "it-pipe": "^3.0.1",
     "it-to-buffer": "^4.0.1",
     "p-defer": "^4.0.0",
@@ -180,5 +87,8 @@
   },
   "browser": {
     "./dist/src/alloc-unsafe.js": "./dist/src/alloc-unsafe-browser.js"
+  },
+  "typedoc": {
+    "entryPoint": "./src/index.ts"
   }
 }

package/src/index.ts

@@ -1,5 +1,5 @@
 import { MplexStreamMuxer } from './mplex.js'
-import type { StreamMuxer, StreamMuxerFactory, StreamMuxerInit } from '@libp2p/interface-stream-muxer'
+import type { StreamMuxer, StreamMuxerFactory, StreamMuxerInit } from '@libp2p/interface/stream-muxer'
 
 export interface MplexInit {
   /**

package/src/mplex.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { logger } from '@libp2p/logger'
 import { abortableSource } from 'abortable-iterator'
 import { anySignal } from 'any-signal'
@@ -10,8 +10,8 @@ import { encode } from './encode.js'
 import { MessageTypes, MessageTypeNames, type Message } from './message-types.js'
 import { createStream } from './stream.js'
 import type { MplexInit } from './index.js'
-import type { Stream } from '@libp2p/interface-connection'
-import type { StreamMuxer, StreamMuxerInit } from '@libp2p/interface-stream-muxer'
+import type { Stream } from '@libp2p/interface/connection'
+import type { StreamMuxer, StreamMuxerInit } from '@libp2p/interface/stream-muxer'
 import type { Sink, Source } from 'it-stream-types'
 import type { Uint8ArrayList } from 'uint8arraylist'