Fix wx request json decode (#2)

blackstorm · May 26, 2023 · 8267c3d · 8267c3d
1 parent b344ddf
commit 8267c3d
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -17,6 +17,9 @@ Official JavaScript SDK (browser and node) for interacting with the [PocketBase
 - [Definitions](#definitions)
 - [Development](#development)
 
+## Knew issues
+- Auto cancellation not work
+
 
 ## Installation
 

diff --git a/dist/pocketbase.cjs.js b/dist/pocketbase.cjs.js
diff --git a/dist/pocketbase.cjs.js.map b/dist/pocketbase.cjs.js.map
diff --git a/dist/pocketbase.es.js b/dist/pocketbase.es.js
diff --git a/dist/pocketbase.es.js.map b/dist/pocketbase.es.js.map
diff --git a/dist/pocketbase.es.mjs b/dist/pocketbase.es.mjs
diff --git a/dist/pocketbase.es.mjs.map b/dist/pocketbase.es.mjs.map
diff --git a/dist/pocketbase.iife.js b/dist/pocketbase.iife.js
diff --git a/dist/pocketbase.iife.js.map b/dist/pocketbase.iife.js.map
diff --git a/dist/pocketbase.umd.js b/dist/pocketbase.umd.js
diff --git a/dist/pocketbase.umd.js.map b/dist/pocketbase.umd.js.map
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.15.0",
+    "version": "0.0.2",
     "name": "pocketbase",
     "description": "PocketBase JavaScript SDK",
     "author": "Gani Georgiev",

diff --git a/src/Client.ts b/src/Client.ts
@@ -131,7 +131,7 @@ export default class Client {
 
     private cancelControllers: { [key: string]: AbortController } = {};
     private recordServices: { [key: string]: RecordService } = {};
-    private enableAutoCancellation: boolean = true;
+    private enableAutoCancellation: boolean = false;
 
     constructor(
         baseUrl = '/',
@@ -298,9 +298,11 @@ export default class Client {
 
         // send the request
         return wxFetch(url, options).then(async (response) => {
-            let data = JSON.parse(response.data);
+            let data = response.data
 
-            if (this.afterSend) data = await this.afterSend(response, data);
+            if (this.afterSend) {
+                data = await this.afterSend(response, data);
+            }
 
             if (response.statusCode >= 400) {
                 throw new ClientResponseError({

diff --git a/src/stores/LocalAuthStore.ts b/src/stores/LocalAuthStore.ts
@@ -78,8 +78,8 @@ export default class LocalAuthStore extends BaseAuthStore {
      * (or runtime/memory if local storage is undefined).
      */
     private _storageGet(key: string): any {
-        if (typeof window !== 'undefined' && window?.localStorage) {
-            const rawValue = window.localStorage.getItem(key) || '';
+        if (wx) {
+            const rawValue = wx.getStorageSync(key) || '';
             try {
                 return JSON.parse(rawValue);
             } catch (e) { // not a json
@@ -96,13 +96,13 @@ export default class LocalAuthStore extends BaseAuthStore {
      * (or runtime/memory if local storage is undefined).
      */
     private _storageSet(key: string, value: any) {
-        if (typeof window !== 'undefined' && window?.localStorage) {
+        if (wx) {
             // store in local storage
             let normalizedVal = value;
             if (typeof value !== 'string') {
                 normalizedVal = JSON.stringify(value);
             }
-            window.localStorage.setItem(key, normalizedVal);
+            wx.setStorageSync(key, normalizedVal);
         } else {
             // store in fallback
             this.storageFallback[key] = value;
@@ -114,8 +114,8 @@ export default class LocalAuthStore extends BaseAuthStore {
      */
     private _storageRemove(key: string) {
         // delete from local storage
-        if (typeof window !== 'undefined' && window?.localStorage) {
-            window.localStorage?.removeItem(key);
+        if (wx) {
+            wx.removeStorageSync(key);
         }
 
         // delete from fallback