chore: tidy up linting

Author: achingbrain

packages/interface-ipfs-core/src/add-all.js

@@ -15,7 +15,6 @@ const { isNode } = require('ipfs-utils/src/env')
 const { getDescribe, getIt, expect } = require('./utils/mocha')
 const testTimeout = require('./utils/test-timeout')
 const uint8ArrayFromString = require('uint8arrays/from-string')
-const pushable = require('it-pushable')
 
 /** @typedef { import("ipfsd-ctl/src/factory") } Factory */
 /**

packages/ipfs-client/.aegir.js

@@ -0,0 +1,38 @@
+'use strict'
+
+const { createFactory } = require('ipfsd-ctl')
+
+const factory = createFactory({
+  type: 'js',
+  test: true,
+  disposable: true,
+  ipfsHttpModule: require('../ipfs-http-client'),
+  ipfsBin: require.resolve('../ipfs/src/cli.js')
+})
+
+module.exports = {
+  bundlesize: { maxSize: '81kB' },
+  karma: {
+    files: [{
+      pattern: 'node_modules/interface-ipfs-core/test/fixtures/**/*',
+      watched: false,
+      served: true,
+      included: false
+    }],
+    browserNoActivityTimeout: 210 * 1000,
+    singleRun: true
+  },
+  hooks: {
+    pre: async () => {
+      const node = await factory.spawn()
+
+      return {
+        env: {
+          GRPC_SERVER: node.grpcAddr,
+          HTTP_SERVER: node.apiAddr
+        }
+      }
+    },
+    post: () => factory.clean()
+  }
+}

packages/ipfs-client/README.md

@@ -0,0 +1,50 @@
+{
+  "name": "ipfs-client",
+  "version": "0.0.0",
+  "description": "A client library to talk to local IPFS daemons",
+  "keywords": [
+    "ipfs"
+  ],
+  "homepage": "https://github.com/ipfs/js-ipfs/tree/master/packages/ipfs-client#readme",
+  "bugs": "https://github.com/ipfs/js-ipfs/issues",
+  "license": "(Apache-2.0 OR MIT)",
+  "leadMaintainer": "Alex Potsides <[email protected]>",
+  "files": [
+    "src",
+    "dist"
+  ],
+  "main": "src/index.js",
+  "typesVersions": {
+    "*": {
+      "*": [
+        "dist/*"
+      ]
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ipfs/js-ipfs.git"
+  },
+  "scripts": {
+    "test": "aegir test -f ./test/interface-client.js",
+    "lint": "aegir lint",
+    "build": "npm run build:js && npm run build:types",
+    "build:js": "aegir build",
+    "build:types": "tsc --build",
+    "coverage": "npx nyc -r html npm run test:node -- --bail",
+    "clean": "rm -rf ./dist",
+    "dep-check": "aegir dep-check"
+  },
+  "dependencies": {
+    "debug": "^4.1.1",
+    "ipfs-grpc-client": "0.0.0",
+    "ipfs-http-client": "^48.1.0"
+  },
+  "devDependencies": {
+    "aegir": "^28.0.0",
+    "cross-env": "^7.0.0",
+    "ipfs-grpc-server": "0.0.0",
+    "interface-ipfs-core": "^0.141.0",
+    "typescript": "^4.0.3"
+  }
+}

packages/ipfs-client/package.json

@@ -0,0 +1,44 @@
+'use strict'
+
+const httpClient = require('ipfs-http-client')
+const grpcClient = require('ipfs-grpc-client')
+const toUri = require('multiaddr-to-uri')
+const debug = require('debug')('ipfs:client')
+
+module.exports = async function createClient (opts = {}) {
+  opts = opts || {}
+
+  debug('ws', opts.grpc)
+  debug('ht', opts.http)
+
+  opts.grpc = toUri(opts.grpc.replace(/\/ws$/, ''))
+  opts.http = toUri(opts.http)
+
+  debug('ws', opts.grpc)
+  debug('ht', opts.http)
+
+  const http = httpClient({
+    ...opts,
+    url: opts.http
+  })
+
+  const grpc = grpcClient({
+    ...opts,
+    url: opts.grpc
+  })
+
+  try {
+    // call a cheap method to see if gRPC is supported
+    await grpc.id()
+
+    // override supported methods, everything else falls back to HTTP
+    return {
+      ...http,
+      ...grpc
+    }
+  } catch (err) {
+    debug(err)
+  }
+
+  return http
+}

packages/ipfs-client/src/index.js

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist"
+  },
+  "include": [
+    "src",
+    "package.json"
+  ]
+}

packages/ipfs-grpc-client/test/interface-grpc-client.js renamed to packages/ipfs-client/test/interface-client.js

@@ -35,8 +35,6 @@ function isFileObject (obj) {
 const isReadableStream = (value) =>
   value && typeof value.getReader === 'function'
 
-'use strict'
-
 /**
  * @param {any} mtime
  * @returns {{secs:number, nsecs:number}|undefined}

packages/ipfs-client/tsconfig.json

@@ -1 +1,7 @@
 'use strict'
+
+/**
+ * @template {any[]} ARGS
+ * @template R
+ * @typedef {(...args: ARGS) => R} Fn
+ */

packages/ipfs-core-utils/src/files/normalise-input/utils.js

@@ -15,7 +15,7 @@ let sigServerB
 let ipfsdServer
 
 module.exports = {
-  bundlesize: { maxSize: '523kB' },
+  bundlesize: { maxSize: '560kB' },
   karma: {
     files: [{
       pattern: 'node_modules/interface-ipfs-core/test/fixtures/**/*',

packages/ipfs-core-utils/src/index.js

@@ -1,38 +1,5 @@
 'use strict'
 
-const { createFactory } = require('ipfsd-ctl')
-
-const factory = createFactory({
-  type: 'js',
-  test: true,
-  disposable: true,
-  ipfsHttpModule: require('../ipfs-http-client'),
-  ipfsBin: require.resolve('../ipfs/src/cli.js')
-})
-
 module.exports = {
-  bundlesize: { maxSize: '81kB' },
-  karma: {
-    files: [{
-      pattern: 'node_modules/interface-ipfs-core/test/fixtures/**/*',
-      watched: false,
-      served: true,
-      included: false
-    }],
-    browserNoActivityTimeout: 210 * 1000,
-    singleRun: true
-  },
-  hooks: {
-    pre: async () => {
-      const node = await factory.spawn()
-
-      return {
-        env: {
-          GRPC_SERVER: node.grpcAddr,
-          HTTP_SERVER: node.apiAddr
-        }
-      }
-    },
-    post: () => factory.clean()
-  }
+  bundlesize: { maxSize: '81kB' }
 }

packages/ipfs-core/.aegir.js

@@ -29,7 +29,7 @@
     "url": "git+https://github.com/ipfs/js-ipfs.git"
   },
   "scripts": {
-    "test": "aegir test -f ./test/interface-grpc-client.js",
+    "test": "aegir test",
     "lint": "aegir lint",
     "build": "npm run build:js && npm run build:types",
     "build:js": "aegir build",
@@ -44,11 +44,11 @@
     "@improbable-eng/grpc-web": "^0.13.0",
     "@improbable-eng/grpc-web-node-http-transport": "^0.13.0",
     "@types/google-protobuf": "^3.7.4",
+    "debug": "^4.1.1",
     "err-code": "^2.0.3",
     "google-protobuf": "^3.13.0",
     "ipfs-core-utils": "^0.5.0",
     "ipfs-grpc-protocol": "0.0.0",
-    "ipfs-http-client": "^48.0.0",
     "ipfs-utils": "^4.0.0",
     "it-pushable": "^1.4.0"
   },