safari app messaging for storage service

This commit is contained in:
Kyle Spearrin 2019-08-13 11:47:29 -04:00
parent 384f3f1e47
commit 343ebe341b
1 changed files with 21 additions and 28 deletions

View File

@ -3,31 +3,23 @@ import {
StorageService, StorageService,
} from 'jslib/abstractions'; } from 'jslib/abstractions';
export default class BrowserStorageService implements StorageService { import { SafariApp } from '../browser/safariApp';
private safariStorageApi: any;
private chromeStorageApi: any;
constructor(private platformUtilsService: PlatformUtilsService, private secure: boolean) { export default class BrowserStorageService implements StorageService {
if (platformUtilsService.isSafari()) { private chromeStorageApi: any;
this.safariStorageApi = secure ? safari.extension.secureSettings : safari.extension.settings; private isSafari: boolean;
} else {
constructor(platformUtilsService: PlatformUtilsService) {
this.isSafari = platformUtilsService.isSafari();
if (!this.isSafari) {
this.chromeStorageApi = chrome.storage.local; this.chromeStorageApi = chrome.storage.local;
} }
} }
get<T>(key: string): Promise<T> { async get<T>(key: string): Promise<T> {
if (this.safariStorageApi) { if (this.isSafari) {
return new Promise((resolve) => { const obj = await SafariApp.sendMessageToApp('storage_get', key);
const json = this.safariStorageApi.getItem(key); return obj as T;
if (json) {
const obj = JSON.parse(json);
if (obj != null && obj[key] != null) {
resolve(obj[key] as T);
return;
}
}
resolve(null);
});
} else { } else {
return new Promise((resolve) => { return new Promise((resolve) => {
this.chromeStorageApi.get(key, (obj: any) => { this.chromeStorageApi.get(key, (obj: any) => {
@ -41,11 +33,13 @@ export default class BrowserStorageService implements StorageService {
} }
} }
save(key: string, obj: any): Promise<any> { async save(key: string, obj: any): Promise<any> {
const keyedObj = { [key]: obj }; const keyedObj = { [key]: obj };
if (this.safariStorageApi) { if (this.isSafari) {
this.safariStorageApi.setItem(key, JSON.stringify(keyedObj)); await SafariApp.sendMessageToApp('storage_save', {
return Promise.resolve(); key: key,
obj: obj,
});
} else { } else {
return new Promise((resolve) => { return new Promise((resolve) => {
this.chromeStorageApi.set(keyedObj, () => { this.chromeStorageApi.set(keyedObj, () => {
@ -55,10 +49,9 @@ export default class BrowserStorageService implements StorageService {
} }
} }
remove(key: string): Promise<any> { async remove(key: string): Promise<any> {
if (this.safariStorageApi) { if (this.isSafari) {
this.safariStorageApi.removeItem(key); await SafariApp.sendMessageToApp('storage_remove', key);
return Promise.resolve();
} else { } else {
return new Promise((resolve) => { return new Promise((resolve) => {
this.chromeStorageApi.remove(key, () => { this.chromeStorageApi.remove(key, () => {