feat: improve gateway checks (#627)

* feat: use bee-js isGateway method to check for gateways

* fix: use https for gateway

* test(fix): use proper gateway url

Author: Cafe137

package-lock.json

@@ -63,7 +63,7 @@
   },
   "dependencies": {
     "@ethereumjs/wallet": "^2.0.4",
-    "@ethersphere/bee-js": "^9.5.0",
+    "@ethersphere/bee-js": "^9.6.0",
     "cafe-utility": "^27.14.0",
     "chalk": "^2.4.2",
     "cli-progress": "^3.11.2",

package.json

@@ -10,7 +10,7 @@ export class List extends PinningCommand implements LeafCommand {
   public readonly description = 'List pinned root hashes'
 
   public async run(): Promise<void> {
-    super.init()
+    await super.init()
     this.console.info('Getting pinned root hashes...')
 
     const pins = await this.bee.getAllPins()

src/command/pinning/list.ts

@@ -12,7 +12,7 @@ export class Pin extends PinningCommand implements LeafCommand {
   public address!: string
 
   public async run(): Promise<void> {
-    super.init()
+    await super.init()
 
     try {
       await this.bee.pin(this.address)

src/command/pinning/pin.ts

@@ -1,12 +1,11 @@
 import { exit } from 'process'
-import { isGateway } from '../../utils'
 import { RootCommand } from '../root-command'
 
 export class PinningCommand extends RootCommand {
-  protected init(): void {
+  protected async init(): Promise<void> {
     super.init()
 
-    if (isGateway(this.beeApiUrl)) {
+    if (await this.bee.isGateway()) {
       this.console.error('Pinning is currently not supported on the gateway node.')
       this.console.error('You can use the pinning API with your local Bee node.')
 

src/command/pinning/pinning-command.ts

@@ -11,7 +11,7 @@ export class ReuploadAll extends PinningCommand implements LeafCommand {
   public stamp!: string
 
   public async run(): Promise<void> {
-    super.init()
+    await super.init()
 
     const chunks = await this.bee.getAllPins()
 

src/command/pinning/reupload-all.ts

@@ -23,7 +23,7 @@ export class Reupload extends PinningCommand implements LeafCommand {
   public stamp!: string
 
   public async run(): Promise<void> {
-    super.init()
+    await super.init()
 
     if (!this.stamp) {
       this.stamp = await pickStamp(this.bee, this.console)

src/command/pinning/reupload.ts

@@ -12,7 +12,7 @@ export class Unpin extends PinningCommand implements LeafCommand {
   public address!: string
 
   public async run(): Promise<void> {
-    super.init()
+    await super.init()
 
     try {
       await this.bee.unpin(this.address)

src/command/pinning/unpin.ts

@@ -7,7 +7,7 @@ import { join, parse } from 'path'
 import { exit } from 'process'
 import { setCurlStore } from '../curl'
 import { pickStamp, printStamp } from '../service/stamp'
-import { fileExists, isGateway, readStdin } from '../utils'
+import { fileExists, readStdin } from '../utils'
 import { CommandLineError } from '../utils/error'
 import { getMime } from '../utils/mime'
 import { stampProperties } from '../utils/option'
@@ -127,7 +127,7 @@ export class Upload extends RootCommand implements LeafCommand {
   public async run(usedFromOtherCommand = false): Promise<void> {
     super.init()
 
-    if (this.hasUnsupportedGatewayOptions()) {
+    if (await this.hasUnsupportedGatewayOptions()) {
       exit(1)
     }
 
@@ -145,7 +145,7 @@ export class Upload extends RootCommand implements LeafCommand {
     }
 
     if (!this.stamp) {
-      if (isGateway(this.beeApiUrl)) {
+      if (await this.bee.isGateway()) {
         this.stamp = '0'.repeat(64)
       } else {
         this.stamp = await pickStamp(this.bee, this.console)
@@ -183,7 +183,7 @@ export class Upload extends RootCommand implements LeafCommand {
     if (!usedFromOtherCommand) {
       this.console.quiet(this.result.getOrThrow().toHex())
 
-      if (!isGateway(this.beeApiUrl) && !this.quiet) {
+      if (!(await this.bee.isGateway()) && !this.quiet) {
         printStamp(await this.bee.getPostageBatch(this.stamp), this.console, { shortenBatchId: true })
       }
     }
@@ -419,8 +419,8 @@ export class Upload extends RootCommand implements LeafCommand {
     return size
   }
 
-  private hasUnsupportedGatewayOptions(): boolean {
-    if (!isGateway(this.beeApiUrl)) {
+  private async hasUnsupportedGatewayOptions(): Promise<boolean> {
+    if (!(await this.bee.isGateway())) {
       return false
     }
 

src/command/upload.ts

@@ -29,10 +29,6 @@ export function directoryExists(path: string): boolean {
   }
 }
 
-export function isGateway(url: string): boolean {
-  return url.includes('gateway.ethswarm.org')
-}
-
 export function getByteSize(data: string | Uint8Array): number {
   if (data instanceof Uint8Array) {
     return data.byteLength