chore: upgrade snjs and sncrypto deps

This commit is contained in:
Mo Bitar
2020-09-09 10:25:27 -05:00
parent 86e77eee7c
commit 30f0650b38
8 changed files with 35 additions and 27 deletions

View File

@@ -1,11 +1,24 @@
import { PurePayload, Environment } from "snjs";
/** Platform-specific (i-e Electron/browser) behavior is handled by a Bridge object. */ /** Platform-specific (i-e Electron/browser) behavior is handled by a Bridge object. */
export interface Bridge { export interface Bridge {
environment: Environment;
getKeychainValue(): Promise<unknown>; getKeychainValue(): Promise<unknown>;
setKeychainValue(value: any): Promise<void>; setKeychainValue(value: any): Promise<void>;
clearKeychainValue(): Promise<void>; clearKeychainValue(): Promise<void>;
extensionsServerHost?: string;
syncComponents(payloads: PurePayload[]): void;
onMajorDataChange(): void;
onInitialDataLoad(): void;
onSearch(text?: string): void;
} }
export declare class BrowserBridge implements Bridge { export declare class BrowserBridge implements Bridge {
environment: Environment;
getKeychainValue(): Promise<unknown>; getKeychainValue(): Promise<unknown>;
setKeychainValue(value: any): Promise<void>; setKeychainValue(value: any): Promise<void>;
clearKeychainValue(): Promise<void>; clearKeychainValue(): Promise<void>;
/** No-ops */
syncComponents(): void;
onMajorDataChange(): void;
onInitialDataLoad(): void;
onSearch(): void;
} }

View File

@@ -2,6 +2,7 @@
import { SNComponent, PurePayload } from 'snjs'; import { SNComponent, PurePayload } from 'snjs';
import { WebApplication } from '@/ui_models/application'; import { WebApplication } from '@/ui_models/application';
import { ApplicationService, ApplicationEvent } from 'snjs'; import { ApplicationService, ApplicationEvent } from 'snjs';
import { Bridge } from './bridge';
declare type UpdateObserverCallback = (component: SNComponent) => void; declare type UpdateObserverCallback = (component: SNComponent) => void;
declare type ComponentActivationCallback = (payload: PurePayload) => void; declare type ComponentActivationCallback = (payload: PurePayload) => void;
declare type ComponentActivationObserver = { declare type ComponentActivationObserver = {
@@ -9,6 +10,7 @@ declare type ComponentActivationObserver = {
callback: ComponentActivationCallback; callback: ComponentActivationCallback;
}; };
export declare class DesktopManager extends ApplicationService { export declare class DesktopManager extends ApplicationService {
private bridge;
$rootScope: ng.IRootScopeService; $rootScope: ng.IRootScopeService;
$timeout: ng.ITimeoutService; $timeout: ng.ITimeoutService;
componentActivationObservers: ComponentActivationObserver[]; componentActivationObservers: ComponentActivationObserver[];
@@ -17,14 +19,9 @@ export declare class DesktopManager extends ApplicationService {
}[]; }[];
isDesktop: any; isDesktop: any;
dataLoaded: boolean; dataLoaded: boolean;
dataLoadHandler?: () => void;
majorDataChangeHandler?: () => void;
extServerHost?: string;
installationSyncHandler?: (payloads: PurePayload[]) => void;
installComponentHandler?: (payload: PurePayload) => void;
lastSearchedText?: string; lastSearchedText?: string;
searchHandler?: (text?: string) => void; private removeComponentObserver?;
constructor($rootScope: ng.IRootScopeService, $timeout: ng.ITimeoutService, application: WebApplication); constructor($rootScope: ng.IRootScopeService, $timeout: ng.ITimeoutService, application: WebApplication, bridge: Bridge);
get webApplication(): WebApplication; get webApplication(): WebApplication;
deinit(): void; deinit(): void;
onAppEvent(eventName: ApplicationEvent): Promise<void>; onAppEvent(eventName: ApplicationEvent): Promise<void>;
@@ -36,11 +33,9 @@ export declare class DesktopManager extends ApplicationService {
*/ */
convertComponentForTransmission(component: SNComponent): Promise<PurePayload>; convertComponentForTransmission(component: SNComponent): Promise<PurePayload>;
syncComponentsInstallation(components: SNComponent[]): void; syncComponentsInstallation(components: SNComponent[]): void;
installComponent(component: SNComponent): Promise<void>;
registerUpdateObserver(callback: UpdateObserverCallback): () => void; registerUpdateObserver(callback: UpdateObserverCallback): () => void;
searchText(text?: string): void; searchText(text?: string): void;
redoSearch(): void; redoSearch(): void;
desktop_setSearchHandler(handler: (text?: string) => void): void;
desktop_windowGainedFocus(): void; desktop_windowGainedFocus(): void;
desktop_windowLostFocus(): void; desktop_windowLostFocus(): void;
desktop_onComponentInstallationComplete(componentData: any, error: any): Promise<void>; desktop_onComponentInstallationComplete(componentData: any, error: any): Promise<void>;
@@ -50,12 +45,8 @@ export declare class DesktopManager extends ApplicationService {
}; };
desktop_deregisterComponentActivationObserver(observer: ComponentActivationObserver): void; desktop_deregisterComponentActivationObserver(observer: ComponentActivationObserver): void;
notifyComponentActivation(component: SNComponent): Promise<void>; notifyComponentActivation(component: SNComponent): Promise<void>;
desktop_setExtServerHost(host: string): void; onExtensionsReady(): void;
desktop_setComponentInstallationSyncHandler(handler: (payloads: PurePayload[]) => void): void; desktop_requestBackupFile(): Promise<string | undefined>;
desktop_setInstallComponentHandler(handler: (payload: PurePayload) => void): void;
desktop_setInitialDataLoadHandler(handler: () => void): void;
desktop_requestBackupFile(callback: (data: any) => void): Promise<void>;
desktop_setMajorDataChangeHandler(handler: () => void): void;
desktop_didBeginBackup(): void; desktop_didBeginBackup(): void;
desktop_didFinishBackup(success: boolean): void; desktop_didFinishBackup(success: boolean): void;
} }

View File

@@ -37,6 +37,7 @@ export declare const STRING_ENTER_ACCOUNT_PASSWORD = "Enter your account passwor
export declare const STRING_ENTER_PASSCODE_FOR_MIGRATION = "Your application passcode is required to perform an upgrade of your local data storage structure."; export declare const STRING_ENTER_PASSCODE_FOR_MIGRATION = "Your application passcode is required to perform an upgrade of your local data storage structure.";
export declare const STRING_STORAGE_UPDATE = "Storage Update"; export declare const STRING_STORAGE_UPDATE = "Storage Update";
export declare const STRING_AUTHENTICATION_REQUIRED = "Authentication Required"; export declare const STRING_AUTHENTICATION_REQUIRED = "Authentication Required";
export declare const STRING_UNSUPPORTED_BACKUP_FILE_VERSION = "This backup file was created using an unsupported version of the application and cannot be imported here. Please update your application and try again.";
/** @password_change */ /** @password_change */
export declare const STRING_FAILED_PASSWORD_CHANGE = "There was an error re-encrypting your items. Your password was changed, but not all your items were properly re-encrypted and synced. You should try syncing again. If all else fails, you should restore your notes from backup."; export declare const STRING_FAILED_PASSWORD_CHANGE = "There was an error re-encrypting your items. Your password was changed, but not all your items were properly re-encrypted and synced. You should try syncing again. If all else fails, you should restore your notes from backup.";
export declare const STRING_CONFIRM_APP_QUIT_DURING_UPGRADE: string; export declare const STRING_CONFIRM_APP_QUIT_DURING_UPGRADE: string;

View File

@@ -25,7 +25,7 @@ export declare class WebApplication extends SNApplication {
private currentAuthenticationElement?; private currentAuthenticationElement?;
editorGroup: EditorGroup; editorGroup: EditorGroup;
componentGroup: ComponentGroup; componentGroup: ComponentGroup;
constructor($compile: ng.ICompileService, $timeout: ng.ITimeoutService, scope: ng.IScope, onDeinit: (app: WebApplication) => void, bridge: Bridge); constructor($compile: ng.ICompileService, $timeout: ng.ITimeoutService, scope: ng.IScope, onDeinit: (app: WebApplication) => void, defaultSyncServerHost: string, bridge: Bridge);
/** @override */ /** @override */
deinit(): void; deinit(): void;
setWebServices(services: WebServices): void; setWebServices(services: WebServices): void;

View File

@@ -3,6 +3,7 @@ import { WebApplication } from './application';
import { Bridge } from '@/services/bridge'; import { Bridge } from '@/services/bridge';
declare type AppManagerChangeCallback = () => void; declare type AppManagerChangeCallback = () => void;
export declare class ApplicationGroup { export declare class ApplicationGroup {
private defaultSyncServerHost;
private bridge; private bridge;
$compile: ng.ICompileService; $compile: ng.ICompileService;
$rootScope: ng.IRootScopeService; $rootScope: ng.IRootScopeService;
@@ -10,7 +11,7 @@ export declare class ApplicationGroup {
applications: WebApplication[]; applications: WebApplication[];
changeObservers: AppManagerChangeCallback[]; changeObservers: AppManagerChangeCallback[];
activeApplication?: WebApplication; activeApplication?: WebApplication;
constructor($compile: ng.ICompileService, $rootScope: ng.IRootScopeService, $timeout: ng.ITimeoutService, bridge: Bridge); constructor($compile: ng.ICompileService, $rootScope: ng.IRootScopeService, $timeout: ng.ITimeoutService, defaultSyncServerHost: string, bridge: Bridge);
private createDefaultApplication; private createDefaultApplication;
/** @callback */ /** @callback */
onApplicationDeinit(application: WebApplication): void; onApplicationDeinit(application: WebApplication): void;

View File

@@ -3,7 +3,7 @@ import { Bridge } from './services/bridge';
export declare class WebDeviceInterface extends DeviceInterface { export declare class WebDeviceInterface extends DeviceInterface {
private bridge; private bridge;
private database; private database;
constructor(namespace: string, timeout: any, bridge: Bridge); constructor(timeout: any, bridge: Bridge);
setApplication(application: SNApplication): void; setApplication(application: SNApplication): void;
deinit(): void; deinit(): void;
getRawStorageValue(key: string): Promise<string | null>; getRawStorageValue(key: string): Promise<string | null>;
@@ -24,8 +24,10 @@ export declare class WebDeviceInterface extends DeviceInterface {
saveRawDatabasePayloads(payloads: any[]): Promise<void>; saveRawDatabasePayloads(payloads: any[]): Promise<void>;
removeRawDatabasePayloadWithId(id: string): Promise<void>; removeRawDatabasePayloadWithId(id: string): Promise<void>;
removeAllRawDatabasePayloads(): Promise<void>; removeAllRawDatabasePayloads(): Promise<void>;
getKeychainValue(): Promise<unknown>; getNamespacedKeychainValue(): Promise<any>;
setKeychainValue(value: any): Promise<void>; setNamespacedKeychainValue(value: any): Promise<void>;
clearKeychainValue(): Promise<void>; clearNamespacedKeychainValue(): Promise<void>;
getRawKeychainValue(): Promise<any>;
clearRawKeychainValue(): Promise<void>;
openUrl(url: string): void; openUrl(url: string): void;
} }

8
package-lock.json generated
View File

@@ -10952,12 +10952,12 @@
} }
}, },
"sncrypto": { "sncrypto": {
"version": "github:standardnotes/sncrypto#49732d8215312a08a71b833b79e94ba7c1872e11", "version": "github:standardnotes/sncrypto#0b12b9748fde7c82e48609836838953b03c9200a",
"from": "github:standardnotes/sncrypto#49732d8215312a08a71b833b79e94ba7c1872e11" "from": "github:standardnotes/sncrypto#0b12b9748fde7c82e48609836838953b03c9200a"
}, },
"snjs": { "snjs": {
"version": "github:standardnotes/snjs#ee696470fa0d5e762a39ce179f215052327acbc3", "version": "github:standardnotes/snjs#bb04a94a9b91f2ce95ecb55f823d4a98a6654291",
"from": "github:standardnotes/snjs#ee696470fa0d5e762a39ce179f215052327acbc3" "from": "github:standardnotes/snjs#bb04a94a9b91f2ce95ecb55f823d4a98a6654291"
}, },
"sockjs": { "sockjs": {
"version": "0.3.20", "version": "0.3.20",

View File

@@ -66,7 +66,7 @@
"webpack-merge": "^4.2.2" "webpack-merge": "^4.2.2"
}, },
"dependencies": { "dependencies": {
"sncrypto": "github:standardnotes/sncrypto#49732d8215312a08a71b833b79e94ba7c1872e11", "sncrypto": "github:standardnotes/sncrypto#0b12b9748fde7c82e48609836838953b03c9200a",
"snjs": "github:standardnotes/snjs#ee696470fa0d5e762a39ce179f215052327acbc3" "snjs": "github:standardnotes/snjs#bb04a94a9b91f2ce95ecb55f823d4a98a6654291"
} }
} }