fwk-api - npm Package Compare versions

Comparing version 0.0.25 to 0.0.26

index.js

 import axios from 'axios'
+import { Network } from '@capacitor/network'
 
@@ -7,4 +8,4 @@ let srv
 const api = {
-  init: ( cfg ) => {
-    conLogger( 'api cfg: ' + cfg )
+  init: (cfg) => {
+    conLogger('api cfg: ' + cfg)
     const headersDef = {
@@ -16,14 +17,14 @@ // 'Access-Control-Allow-Credentials':'true',
     const headers = { ...headersDef, ...cfg.headers }
-    srv = axios.create( {
+    srv = axios.create({
       baseURL: cfg.url,
       headers: headers
-    } )
-    conLogger( 'API SERVICE initialization srv:' + srv )
+    })
+    conLogger('API SERVICE initialization srv:' + srv)
 
-    srv.interceptors.request.use( req => {
-      conLogger( 'interceptor request:'+ req )
+    srv.interceptors.request.use(req => {
+      conLogger('interceptor request:' + req)
       return req
-    } )
-    srv.interceptors.response.use( res => {
-      conLogger( 'interceptor response: '+ res )
+    })
+    srv.interceptors.response.use(res => {
+      conLogger('interceptor response: ' + res)
       return res.data
@@ -33,3 +34,3 @@ },
         const { config } = error
-        conLogger( 'Error FWK-API!!!! :'+ error )
+        conLogger('Error FWK-API!!!! :' + error)
       }
@@ -51,35 +52,42 @@
   },
-  async setHeaders ( headers ) {
-    conLogger( 'setHeaders :'+ headers )
+  async setHeaders (headers) {
+    conLogger('setHeaders :' + headers)
     srv.defaults.headers = { ...srv.defaults.headers, ...headers }
   },
-  setMockFlag: ( flag ) => {
-    conLogger( 'setMockFlag :' + flag )
+  setMockFlag: (flag) => {
+    conLogger('setMockFlag :' + flag)
     delete srv.defaults.headers.mockmode
     srv.defaults.headers.mockmode = flag
   },
-  async callSrv ( method, path, params ) {
-    let res
-    if ( method === "GET" ) res = await srv.get( path )
-    if ( method === "POST" ) res = await srv.post( path, JSON.stringify( params ) )
-    if ( method === "FORM" ) res = await srv.post( path, params )
-    return res
+  async callSrv (method, path, params) {
+    const status = await Network.getStatus() //'wifi' | 'cellular' | 'none' | 'unknown'
+
+    if (status === 'wifi' || status === 'cellular') {
+      let res
+      if (method === "GET") res = await srv.get(path)
+      if (method === "POST") res = await srv.post(path, JSON.stringify(params))
+      if (method === "FORM") res = await srv.post(path, params)
+      return res
+    }
+    else {
+      throw new Error('offline')
+    }
   },
-  async sendFile ( path, params ) {
-    formData.append( "data", params.data )
+  async sendFile (path, params) {
+    formData.append("data", params.data)
 
-    const ctype = srv.defaults.headers[ 'Content-Type' ]
-    delete srv.defaults.headers[ 'Content-Type' ]
-    srv.defaults.headers[ 'Content-Type' ] = 'multipart/form-data'
+    const ctype = srv.defaults.headers['Content-Type']
+    delete srv.defaults.headers['Content-Type']
+    srv.defaults.headers['Content-Type'] = 'multipart/form-data'
 
-    const res = await srv.post( path, formData )
-    srv.defaults.headers[ 'Content-Type' ] = ctype
+    const res = await srv.post(path, formData)
+    srv.defaults.headers['Content-Type'] = ctype
     return res
   },
   async info () {
-    const res = await srv.get( 'info' )
-    conLogger( 'info:' +res )
+    const res = await srv.get('info')
+    conLogger('info:' + res)
     return res
   },
-  async setLogFlag(flag){
+  async setLogFlag (flag) {
     logFlag = flag
@@ -90,3 +98,3 @@ }
 
-function conLogger(str){
+function conLogger (str) {
   if (logFlag)
@@ -93,0 +101,0 @@ console.log(str)

package.json

 {
    "name": "fwk-api",
-   "version": "0.0.25",
+   "version": "0.0.26",
    "description": "Framework with api services access(only javascript)",
@@ -5,0 +5,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

3124

increased by6.99%

Lines of code

89

increased by8.54%

No dependency changes