hivesigner 3.3.4 → 4.0.0

package/src/client.spec.ts

@@ -2,16 +2,14 @@ import { Client } from './client'
 import { ClientConfig } from './types'
 import { API_URL, BASE_URL } from './consts'
 import * as utilities from './utilities'
-import * as crossFetch from 'cross-fetch'
 
 jest.mock('./utilities')
-jest.mock('cross-fetch')
 
 describe('Client', function () {
 	let instance: Client
 	let isBrowserMock: jest.Mock
-	let crossFetchMock: jest.Mock
-	let crossFetchResponseMock: { status: string | number, json: () => {} }
+	let fetchMock: jest.Mock
+	let fetchResponseMock: { status: string | number, json: () => {} }
 
 	beforeEach(() => {
 		instance = new Client({
@@ -26,12 +24,12 @@ describe('Client', function () {
 		isBrowserMock = utilities.isBrowser as jest.Mock
 		isBrowserMock.mockReturnValue(false)
 
-		crossFetchResponseMock = {
+		fetchResponseMock = {
 			status: 200,
 			json: async () => ({ error: '' })
 		}
-		crossFetchMock = crossFetch.fetch as jest.Mock
-		crossFetchMock.mockImplementation(async (...args: any[]) => crossFetchResponseMock)
+		fetchMock = jest.fn().mockImplementation(async (...args: any[]) => fetchResponseMock)
+		global.fetch = fetchMock
 	})
 
 	it('should create instance', function () {
@@ -101,7 +99,7 @@ describe('Client', function () {
 
 	it('should return promise resolve on send call', async function () {
 		const response = await instance.send('me', 'POST', {})
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/me`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/me`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -110,11 +108,11 @@ describe('Client', function () {
 			},
 			body: JSON.stringify({})
 		})
-		expect(response).toStrictEqual(await crossFetchResponseMock.json())
+		expect(response).toStrictEqual(await fetchResponseMock.json())
 	})
 
 	it('should return promise error on send call with if 200 status', async function () {
-		crossFetchResponseMock = {
+		fetchResponseMock = {
 			status: 'not_200_OK',
 			json: async () => ({ error: '' })
 		}
@@ -124,12 +122,12 @@ describe('Client', function () {
 			console.error('Client.send not threw error')
 			expect(true).toBe(false)
 		} catch (failureResponse) {
-			expect(failureResponse).toStrictEqual(await crossFetchResponseMock.json())
+			expect(failureResponse).toStrictEqual(await fetchResponseMock.json())
 		}
 	})
 
 	it('should return promise error on send call if has json error', async function () {
-		crossFetchResponseMock = {
+		fetchResponseMock = {
 			status: 200,
 			json: async () => ({ error: 'I have an error' })
 		}
@@ -140,7 +138,7 @@ describe('Client', function () {
 			expect(true).toBe(false)
 		} catch (failureResponse) {
 			expect(failureResponse).toBeTruthy()
-			expect(failureResponse).toStrictEqual(await crossFetchResponseMock.json())
+			expect(failureResponse).toStrictEqual(await fetchResponseMock.json())
 		}
 	})
 
@@ -149,14 +147,14 @@ describe('Client', function () {
 		const response = await instance.send('me', 'POST', {}, callback)
 
 		expect(callback).toHaveBeenCalled()
-		expect(callback).toHaveBeenCalledWith(null, await crossFetchResponseMock.json())
+		expect(callback).toHaveBeenCalledWith(null, await fetchResponseMock.json())
 		expect(callback).lastReturnedWith('results')
 		expect(response).toBe('results')
 	})
 
 	it('should return promise with failure results on send call with callback', async function () {
 		const callback = jest.fn().mockReturnValue('results')
-		crossFetchResponseMock = {
+		fetchResponseMock = {
 			status: 'not_200_OK',
 			json: async () => ({ error: '' })
 		}
@@ -164,14 +162,14 @@ describe('Client', function () {
 
 
 		expect(callback).toHaveBeenCalled()
-		expect(callback).toHaveBeenCalledWith(await crossFetchResponseMock.json(), null)
+		expect(callback).toHaveBeenCalledWith(await fetchResponseMock.json(), null)
 		expect(callback).lastReturnedWith('results')
 		expect(response).toBe('results')
 	})
 
 	it('should return promise on broadcast call', async function () {
 		const response = await instance.broadcast([])
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -185,7 +183,7 @@ describe('Client', function () {
 
 	it('should return promise on updateUserMetadata call', async function () {
 		const response = await instance.updateUserMetadata({ username: '' })
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/me`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/me`,{
 			method: 'PUT',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -199,7 +197,7 @@ describe('Client', function () {
 
 	it('should send request and return client instance on revokeToken call', async function () {
 		const response = await instance.revokeToken()
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/oauth2/token/revoke`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/oauth2/token/revoke`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -213,7 +211,7 @@ describe('Client', function () {
 
 	it('should send request and return promise on claimRewardBalance call', async function () {
 		const response = await instance.claimRewardBalance('', '', '', '')
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -234,7 +232,7 @@ describe('Client', function () {
 
 	it('should send request and return promise on custom json call', async function () {
 		const response = await instance.customJson('', '', '', {})
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -255,7 +253,7 @@ describe('Client', function () {
 
 	it('should send request and return promise on ignore call', async function () {
 		const response = await instance.ignore('', '')
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -280,7 +278,7 @@ describe('Client', function () {
 
 	it('should send request and return promise on unfollow call', async function () {
 		const response = await instance.unfollow('', '')
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -305,7 +303,7 @@ describe('Client', function () {
 
 	it('should send request and return promise on follow call', async function () {
 		const response = await instance.follow('', '')
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -330,7 +328,7 @@ describe('Client', function () {
 
 	it('should send request and return promise on reblog call', async function () {
 		const response = await instance.reblog('', '', '')
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -355,7 +353,7 @@ describe('Client', function () {
 
 	it('should send request and return promise on deleteComment call', async function () {
 		const response = await instance.deleteComment('', '')
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -374,7 +372,7 @@ describe('Client', function () {
 
 	it('should send request and return promise on comment call', async function () {
 		let response = await instance.comment('', '', '', '', '', {}, {})
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -396,7 +394,7 @@ describe('Client', function () {
 		expect(response).toBeTruthy()
 
 		response = await instance.comment('', '', '', '', '', {}, 'meta')
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -420,7 +418,7 @@ describe('Client', function () {
 
 	it('should send request and return promise on vote call', async function () {
 		const response = await instance.vote('', '', '', 0)
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/broadcast`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',
@@ -441,7 +439,7 @@ describe('Client', function () {
 
 	it('should send request and return promise on me call', async function () {
 		const response = await instance.me()
-		expect(crossFetch.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/me`,{
+		expect(global.fetch).toHaveBeenCalledWith(`${instance.apiURL}/api/me`,{
 			method: 'POST',
 			headers: {
 				Accept: 'application/json, text/plain, */*',

package/src/client.ts

@@ -1,8 +1,6 @@
-import fetch from 'cross-fetch'
-import { CallbackFunction, ClientConfig, LoginOptions, SendResponse } from './types'
+import { CallbackFunction, ClientConfig, LoginOptions, Operation, SendResponse } from './types'
 import { API_URL, BASE_URL } from './consts'
 import { isBrowser } from './utilities'
-import { Operation } from '@hiveio/dhive'
 
 export class Client {
 	public apiURL: string
@@ -293,7 +291,13 @@ export class Client {
 	}
 
 	private async makeRequest(url: string, method: string, body: any): Promise<SendResponse> {
-		const response = await fetch(url, {
+		if (typeof globalThis.fetch !== 'function') {
+			throw new Error(
+				'hivesigner: fetch is not available. Node.js 18+ or a modern browser is required. ' +
+				'If you are in an older environment, provide a global fetch polyfill.'
+			)
+		}
+		const response = await globalThis.fetch(url, {
 			method,
 			headers: {
 				Accept: 'application/json, text/plain, */*',

package/src/methods/send-operation.method.spec.ts

@@ -1,4 +1,4 @@
-import { Operation } from '@hiveio/dhive'
+import { Operation } from '../types'
 import * as hive from 'hive-uri'
 import * as utilities from '../utilities'
 import { CallbackFunction } from '../types'

package/src/methods/send-operation.method.ts

@@ -1,8 +1,7 @@
 import { BETA_URL } from '../consts'
 import { encodeOp, Parameters } from 'hive-uri'
 import { isBrowser } from '../utilities'
-import { CallbackFunction } from '../types'
-import { Operation } from '@hiveio/dhive'
+import { CallbackFunction, Operation } from '../types'
 
 export function sendOperation(op: Operation, params: Parameters, cb: CallbackFunction): string | void {
 	const uri = encodeOp(op, params)

package/src/methods/send-operations.method.spec.ts

@@ -1,4 +1,4 @@
-import { Operation } from '@hiveio/dhive'
+import { Operation } from '../types'
 import * as hive from 'hive-uri'
 import * as utilities from '../utilities'
 import { CallbackFunction } from '../types'

package/src/methods/send-operations.method.ts

@@ -1,8 +1,7 @@
 import { encodeOps, Parameters } from 'hive-uri'
 import { isBrowser } from '../utilities'
 import { BETA_URL } from '../consts'
-import { CallbackFunction } from '../types'
-import { Operation } from '@hiveio/dhive'
+import { CallbackFunction, Operation } from '../types'
 
 export function sendOperations(ops: Operation[], params: Parameters, cb: CallbackFunction): string | void {
 	const uri = encodeOps(ops, params)

package/src/methods/send-transaction.method.spec.ts

@@ -1,5 +1,5 @@
 import { sendTransaction } from './send-transaction.method'
-import { Transaction } from '@hiveio/dhive'
+import { Transaction } from '../types'
 import * as hive from 'hive-uri'
 import * as utilities from '../utilities'
 import { CallbackFunction } from '../types'

package/src/methods/send-transaction.method.ts

@@ -1,8 +1,7 @@
 import { encodeTx, Parameters } from 'hive-uri'
 import { BETA_URL } from '../consts'
 import { isBrowser } from '../utilities'
-import { CallbackFunction } from '../types'
-import { Transaction } from '@hiveio/dhive'
+import { CallbackFunction, Transaction } from '../types'
 
 export function sendTransaction(tx: Transaction, params: Parameters, cb: CallbackFunction): string | void {
 	const uri = encodeTx(tx, params)

package/src/require-import.spec.js

@@ -1,5 +1,10 @@
 const hs = require('../lib/index');
 
+global.fetch = jest.fn().mockResolvedValue({
+  status: 200,
+  json: async () => ({ error: '' })
+});
+
 describe('Require import testing', function () {
   it('should be instance of Client and call me', function () {
     const client = new hs.Client({ accessToken: 'some_wrong_access_token' });
@@ -8,4 +13,4 @@ describe('Require import testing', function () {
     const me = client.me();
     expect(me).toBeInstanceOf(Promise);
   });
-});
+});

package/src/types/hive.types.ts

@@ -0,0 +1,12 @@
+export interface Operation {
+	0: string
+	1: { [key: string]: any }
+}
+
+export interface Transaction {
+	ref_block_num: number
+	ref_block_prefix: number
+	expiration: string
+	operations: Operation[]
+	extensions: any[]
+}

package/src/types/index.ts

@@ -3,3 +3,4 @@ export * from './sign-errors.interface'
 export * from './callback-function.type'
 export * from './login-options.interface'
 export * from './send-response.type'
+export * from './hive.types'

package/tsconfig.json

@@ -6,8 +6,10 @@
     "allowSyntheticDefaultImports": true,
     "sourceMap": true,
     "module": "commonjs",
-    "target": "es5",
+    "target": "ES2017",
+    "lib": ["ES2017", "DOM"],
     "allowJs": false,
+    "skipLibCheck": true,
     "declaration": true,
     "rootDir": "src"
   },

package/webpack.config.js

@@ -15,7 +15,14 @@ module.exports = {
     rules: [
       {
         test: /\.ts$/,
-        loader: 'babel-loader',
+        loader: 'ts-loader',
+        exclude: /node_modules/,
+        options: {
+          compilerOptions: {
+            declaration: false,
+            sourceMap: false,
+          }
+        },
       },
     ]
   },

package/.babelrc

@@ -1,8 +0,0 @@
-{
-  "presets": ["@babel/preset-env", "@babel/preset-typescript"],
-  "plugins": [
-    "@babel/plugin-proposal-object-rest-spread",
-    "@babel/plugin-proposal-class-properties",
-    "@babel/plugin-transform-runtime"
-  ]
-}