heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Revert #8098

Browse source
This commit is contained in:
tamaina 2022-11-24 18:27:05 +09:00
parent 11d2654ffc
commit 8b9dc962ae
7 changed files with 83 additions and 212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/client/package.json
View file

@ -27,7 +27,6 @@
"compare-versions": "5.0.1", "compare-versions": "5.0.1",
"cropperjs": "2.0.0-beta", "cropperjs": "2.0.0-beta",
"date-fns": "2.29.3", "date-fns": "2.29.3",
"deepcopy": "2.1.0",
"escape-regexp": "0.0.1", "escape-regexp": "0.0.1",
"eventemitter3": "4.0.7", "eventemitter3": "4.0.7",
"idb-keyval": "6.2.0", "idb-keyval": "6.2.0",

5
packages/client/src/init.ts
View file

@ -38,7 +38,6 @@ import { reloadChannel } from '@/scripts/unison-reload';
import { reactionPicker } from '@/scripts/reaction-picker'; import { reactionPicker } from '@/scripts/reaction-picker';
import { getUrlWithoutLoginId } from '@/scripts/login-id'; import { getUrlWithoutLoginId } from '@/scripts/login-id';
import { getAccountFromId } from '@/scripts/get-account-from-id'; import { getAccountFromId } from '@/scripts/get-account-from-id';
import { deckStore } from './ui/deck/deck-store';
(async () => { (async () => {
console.info(`Misskey v${version}`); console.info(`Misskey v${version}`);
@ -74,8 +73,6 @@ import { deckStore } from './ui/deck/deck-store';
}); });
} }
await defaultStore.ready;
// タッチデバイスでCSSの:hoverを機能させる // タッチデバイスでCSSの:hoverを機能させる
document.addEventListener('touchend', () => {}, { passive: true }); document.addEventListener('touchend', () => {}, { passive: true });
@ -191,8 +188,6 @@ import { deckStore } from './ui/deck/deck-store';
splash.remove(); splash.remove();
}); });
await deckStore.ready;
// https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210 // https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
// なぜかinit.tsの内容が2回実行されることがあるため、mountするdivを1つに制限する // なぜかinit.tsの内容が2回実行されることがあるため、mountするdivを1つに制限する
const rootEl = (() => { const rootEl = (() => {

223
packages/client/src/pizzax.ts
View file

@ -1,12 +1,8 @@
// PIZZAX --- A lightweight store // PIZZAX --- A lightweight store
import { onUnmounted, Ref, ref, watch } from 'vue'; import { onUnmounted, Ref, ref, watch } from 'vue';
import { BroadcastChannel } from 'broadcast-channel';
import deepcopy from 'deepcopy';
import { $i } from './account'; import { $i } from './account';
import { api } from './os'; import { api } from './os';
import { get, set } from './scripts/idb-proxy';
import { defaultStore } from './store';
import { stream } from './stream'; import { stream } from './stream';
type StateDef = Record<string, { type StateDef = Record<string, {
@ -14,196 +10,119 @@ type StateDef = Record<string, {
default: any; default: any;
}>; }>;
type State<T extends StateDef> = { [K in keyof T]: T[K]['default']; };
type ReactiveState<T extends StateDef> = { [K in keyof T]: Ref<T[K]['default']>; };
type ArrayElement<A> = A extends readonly (infer T)[] ? T : never; type ArrayElement<A> = A extends readonly (infer T)[] ? T : never;
type PizzaxChannelMessage<T extends StateDef> = {
where: 'device' | 'deviceAccount';
key: keyof T;
value: T[keyof T]['default'];
userId?: string;
};
const connection = $i && stream.useChannel('main'); const connection = $i && stream.useChannel('main');
export class Storage<T extends StateDef> { export class Storage<T extends StateDef> {
public readonly ready: Promise<void>;
public readonly loaded: Promise<void>;
public readonly key: string; public readonly key: string;
public readonly deviceStateKeyName: `pizzax::${this['key']}`; public readonly keyForLocalStorage: string;
public readonly deviceAccountStateKeyName: `pizzax::${this['key']}::${string}` | '';
public readonly registryCacheKeyName: `pizzax::${this['key']}::cache::${string}` | '';
public readonly def: T; public readonly def: T;
// TODO: これが実装されたらreadonlyにしたい: https://github.com/microsoft/TypeScript/issues/37487 // TODO: これが実装されたらreadonlyにしたい: https://github.com/microsoft/TypeScript/issues/37487
public readonly state: State<T>; public readonly state: { [K in keyof T]: T[K]['default'] };
public readonly reactiveState: ReactiveState<T>; public readonly reactiveState: { [K in keyof T]: Ref<T[K]['default']> };
private pizzaxChannel: BroadcastChannel<PizzaxChannelMessage<T>>;
// 簡易的にキューイングして占有ロックとする
private currentIdbJob: Promise<any> = Promise.resolve();
private addIdbSetJob<T>(job: () => Promise<T>) {
const promise = this.currentIdbJob.then(job, e => {
console.error('Pizzax failed to save data to idb!', e);
return job();
});
this.currentIdbJob = promise;
return promise;
}
constructor(key: string, def: T) { constructor(key: string, def: T) {
this.key = key; this.key = key;
this.deviceStateKeyName = `pizzax::${key}`; this.keyForLocalStorage = 'pizzax::' + key;
this.deviceAccountStateKeyName = $i ? `pizzax::${key}::${$i.id}` : '';
this.registryCacheKeyName = $i ? `pizzax::${key}::cache::${$i.id}` : '';
this.def = def; this.def = def;
this.pizzaxChannel = new BroadcastChannel(`pizzax::${key}`); // TODO: indexedDBにする
const deviceState = JSON.parse(localStorage.getItem(this.keyForLocalStorage) || '{}');
const deviceAccountState = $i ? JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::' + $i.id) || '{}') : {};
const registryCache = $i ? JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}') : {};
this.state = {} as State<T>; const state = {};
this.reactiveState = {} as ReactiveState<T>; const reactiveState = {};
for (const [k, v] of Object.entries(def)) {
for (const [k, v] of Object.entries(def) as [keyof T, T[keyof T]['default']][]) {
this.state[k] = v.default;
this.reactiveState[k] = ref(v.default);
}
this.ready = this.init();
this.loaded = this.ready.then(() => this.load());
}
private async init(): Promise<void> {
await this.migrate();
const deviceState: State<T> = await get(this.deviceStateKeyName) || {};
const deviceAccountState = $i ? await get(this.deviceAccountStateKeyName) || {} : {};
const registryCache = $i ? await get(this.registryCacheKeyName) || {} : {};
for (const [k, v] of Object.entries(this.def) as [keyof T, T[keyof T]['default']][]) {
if (v.where === 'device' && Object.prototype.hasOwnProperty.call(deviceState, k)) { if (v.where === 'device' && Object.prototype.hasOwnProperty.call(deviceState, k)) {
this.reactiveState[k].value = this.state[k] = deviceState[k]; state[k] = deviceState[k];
} else if (v.where === 'account' && $i && Object.prototype.hasOwnProperty.call(registryCache, k)) { } else if (v.where === 'account' && $i && Object.prototype.hasOwnProperty.call(registryCache, k)) {
this.reactiveState[k].value = this.state[k] = registryCache[k]; state[k] = registryCache[k];
} else if (v.where === 'deviceAccount' && Object.prototype.hasOwnProperty.call(deviceAccountState, k)) { } else if (v.where === 'deviceAccount' && Object.prototype.hasOwnProperty.call(deviceAccountState, k)) {
this.reactiveState[k].value = this.state[k] = deviceAccountState[k]; state[k] = deviceAccountState[k];
} else { } else {
this.reactiveState[k].value = this.state[k] = v.default; state[k] = v.default;
if (_DEV_) console.log('Use default value', k, v.default); if (_DEV_) console.log('Use default value', k, v.default);
} }
} }
for (const [k, v] of Object.entries(state)) {
this.pizzaxChannel.addEventListener('message', ({ where, key, value, userId }) => { reactiveState[k] = ref(v);
// アカウント変更すればunisonReloadが効くため、このreturnが発火することは }
// まずないと思うけど一応弾いておく this.state = state as any;
if (where === 'deviceAccount' && !($i && userId !== $i.id)) return; this.reactiveState = reactiveState as any;
this.reactiveState[key].value = this.state[key] = value;
});
if ($i) { if ($i) {
// streamingのuser storage updateイベントを監視して更新 // なぜかsetTimeoutしないとapi関数内でエラーになる(おそらく循環参照してることに原因がありそう)
connection?.on('registryUpdated', ({ scope, key, value }: { scope?: string[], key: keyof T, value: T[typeof key]['default'] }) => { window.setTimeout(() => {
if (!scope || scope.length !== 2 || scope[0] !== 'client' || scope[1] !== this.key || this.state[key] === value) return; api('i/registry/get-all', { scope: ['client', this.key] }).then(kvs => {
const cache = {};
this.reactiveState[key].value = this.state[key] = value; for (const [k, v] of Object.entries(def)) {
this.addIdbSetJob(async () => {
const cache = await get(this.registryCacheKeyName);
if (cache[key] !== value) {
cache[key] = value;
await set(this.registryCacheKeyName, cache);
}
});
});
}
}
private load(): Promise<void> {
return new Promise((resolve, reject) => {
if ($i) {
// api関数と循環参照なので一応setTimeoutしておく
window.setTimeout(async () => {
await defaultStore.ready;
api('i/registry/get-all', { scope: ['client', this.key] })
.then(kvs => {
const cache: Partial<T> = {};
for (const [k, v] of Object.entries(this.def) as [keyof T, T[keyof T]['default']][]) {
if (v.where === 'account') { if (v.where === 'account') {
if (Object.prototype.hasOwnProperty.call(kvs, k)) { if (Object.prototype.hasOwnProperty.call(kvs, k)) {
this.reactiveState[k].value = this.state[k] = (kvs as Partial<T>)[k]; state[k] = kvs[k];
cache[k] = (kvs as Partial<T>)[k]; reactiveState[k].value = kvs[k];
cache[k] = kvs[k];
} else { } else {
this.reactiveState[k].value = this.state[k] = v.default; state[k] = v.default;
reactiveState[k].value = v.default;
} }
} }
} }
localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache));
return set(this.registryCacheKeyName, cache); });
})
.then(() => resolve());
}, 1); }, 1);
} // streamingのuser storage updateイベントを監視して更新
connection?.on('registryUpdated', ({ scope, key, value }: { scope: string[], key: keyof T, value: T[typeof key]['default'] }) => {
if (scope.length !== 2 || scope[0] !== 'client' || scope[1] !== this.key || this.state[key] === value) return;
resolve(); this.state[key] = value;
this.reactiveState[key].value = value;
const cache = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}');
if (cache[key] !== value) {
cache[key] = value;
localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache));
}
}); });
} }
}
public set<K extends keyof T>(key: K, value: T[K]['default']): Promise<void> { public set<K extends keyof T>(key: K, value: T[K]['default']): void {
// IndexedDBやBroadcastChannelで扱うために単純なオブジェクトにする if (_DEV_) console.log('set', key, value);
// (JSON.parse(JSON.stringify(value))の代わり)
const rawValue = deepcopy(value);
if (_DEV_) console.log('set', key, rawValue, value); this.state[key] = value;
this.reactiveState[key].value = value;
this.reactiveState[key].value = this.state[key] = rawValue;
return this.addIdbSetJob(async () => {
if (_DEV_) console.log(`set ${key} start`);
switch (this.def[key].where) { switch (this.def[key].where) {
case 'device': { case 'device': {
this.pizzaxChannel.postMessage({ const deviceState = JSON.parse(localStorage.getItem(this.keyForLocalStorage) || '{}');
where: 'device', deviceState[key] = value;
key, localStorage.setItem(this.keyForLocalStorage, JSON.stringify(deviceState));
value: rawValue,
});
const deviceState = await get(this.deviceStateKeyName) || {};
deviceState[key] = rawValue;
await set(this.deviceStateKeyName, deviceState);
break; break;
} }
case 'deviceAccount': { case 'deviceAccount': {
if ($i == null) break; if ($i == null) break;
this.pizzaxChannel.postMessage({ const deviceAccountState = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::' + $i.id) || '{}');
where: 'deviceAccount', deviceAccountState[key] = value;
key, localStorage.setItem(this.keyForLocalStorage + '::' + $i.id, JSON.stringify(deviceAccountState));
value: rawValue,
userId: $i.id,
});
const deviceAccountState = await get(this.deviceAccountStateKeyName) || {};
deviceAccountState[key] = rawValue;
await set(this.deviceAccountStateKeyName, deviceAccountState);
break; break;
} }
case 'account': { case 'account': {
if ($i == null) break; if ($i == null) break;
const cache = await get(this.registryCacheKeyName) || {}; const cache = JSON.parse(localStorage.getItem(this.keyForLocalStorage + '::cache::' + $i.id) || '{}');
cache[key] = rawValue; cache[key] = value;
await set(this.registryCacheKeyName, cache); localStorage.setItem(this.keyForLocalStorage + '::cache::' + $i.id, JSON.stringify(cache));
await api('i/registry/set', { api('i/registry/set', {
scope: ['client', this.key], scope: ['client', this.key],
key: key.toString(), key: key,
value: rawValue, value: value,
}); });
break; break;
} }
} }
if (_DEV_) console.log(`set ${key} complete`);
});
} }
public push<K extends keyof T>(key: K, value: ArrayElement<T[K]['default']>): void { public push<K extends keyof T>(key: K, value: ArrayElement<T[K]['default']>): void {
@ -213,7 +132,6 @@ export class Storage<T extends StateDef> {
public reset(key: keyof T) { public reset(key: keyof T) {
this.set(key, this.def[key].default); this.set(key, this.def[key].default);
return this.def[key].default;
} }
/** /**
@ -248,25 +166,4 @@ export class Storage<T extends StateDef> {
}, },
}; };
} }
// localStorage => indexedDBのマイグレーション
private async migrate() {
const deviceState = localStorage.getItem(this.deviceStateKeyName);
if (deviceState) {
await set(this.deviceStateKeyName, JSON.parse(deviceState));
localStorage.removeItem(this.deviceStateKeyName);
}
const deviceAccountState = $i && localStorage.getItem(this.deviceAccountStateKeyName);
if ($i && deviceAccountState) {
await set(this.deviceAccountStateKeyName, JSON.parse(deviceAccountState));
localStorage.removeItem(this.deviceAccountStateKeyName);
}
const registryCache = $i && localStorage.getItem(this.registryCacheKeyName);
if ($i && registryCache) {
await set(this.registryCacheKeyName, JSON.parse(registryCache));
localStorage.removeItem(this.registryCacheKeyName);
}
}
} }

1
packages/client/src/scripts/unison-reload.ts
View file

@ -1,3 +1,4 @@
// SafariがBroadcastChannel未実装なのでライブラリを使う
import { BroadcastChannel } from 'broadcast-channel'; import { BroadcastChannel } from 'broadcast-channel';
export const reloadChannel = new BroadcastChannel<string | null>('reload'); export const reloadChannel = new BroadcastChannel<string | null>('reload');

10
packages/client/src/store.ts
View file

@ -303,16 +303,6 @@ export class ColdDeviceStorage {
} }
} }
public static getAll(): Partial<typeof this.default> {
return (Object.keys(this.default) as (keyof typeof this.default)[]).reduce((acc, key) => {
const value = localStorage.getItem(PREFIX + key);
if (value != null) {
acc[key] = JSON.parse(value);
}
return acc;
}, {} as any);
}
public static set<T extends keyof typeof ColdDeviceStorage.default>(key: T, value: typeof ColdDeviceStorage.default[T]): void { public static set<T extends keyof typeof ColdDeviceStorage.default>(key: T, value: typeof ColdDeviceStorage.default[T]): void {
// 呼び出し側のバグ等で undefined が来ることがある // 呼び出し側のバグ等で undefined が来ることがある
// undefined を文字列として localStorage に入れると参照する際の JSON.parse でコケて不具合の元になるため無視 // undefined を文字列として localStorage に入れると参照する際の JSON.parse でコケて不具合の元になるため無視

3
packages/client/tsconfig.json
View file

@ -11,8 +11,7 @@
"sourceMap": false, "sourceMap": false,
"target": "es2017", "target": "es2017",
"module": "esnext", "module": "esnext",
"moduleResolution": "node", "moduleResolution": "node"
"allowSyntheticDefaultImports": true,
"removeComments": false, "removeComments": false,
"noLib": false, "noLib": false,
"strict": true, "strict": true,

12
yarn.lock
View file

@ -5067,7 +5067,6 @@ __metadata:
cross-env: 7.0.3 cross-env: 7.0.3
cypress: 11.1.0 cypress: 11.1.0
date-fns: 2.29.3 date-fns: 2.29.3
deepcopy: 2.1.0
escape-regexp: 0.0.1 escape-regexp: 0.0.1
eslint: 8.28.0 eslint: 8.28.0
eslint-plugin-import: 2.26.0 eslint-plugin-import: 2.26.0
@ -6067,15 +6066,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"deepcopy@npm:2.1.0":
version: 2.1.0
resolution: "deepcopy@npm:2.1.0"
dependencies:
type-detect: ^4.0.8
checksum: 7890ccaa8ad672bdc33d02626d13666bfbb33a68f7c6e8921a348b962b77edc4daf7f1301a789ec74a97e7f0acd611099c5cdd1e8b32ce93287819722f57b92e
languageName: node
linkType: hard
"deepmerge@npm:^4.2.2": "deepmerge@npm:^4.2.2":
version: 4.2.2 version: 4.2.2
resolution: "deepmerge@npm:4.2.2" resolution: "deepmerge@npm:4.2.2"
@ -16564,7 +16554,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"type-detect@npm:4.0.8, type-detect@npm:^4.0.8": "type-detect@npm:4.0.8":
version: 4.0.8 version: 4.0.8
resolution: "type-detect@npm:4.0.8" resolution: "type-detect@npm:4.0.8"
checksum: 62b5628bff67c0eb0b66afa371bd73e230399a8d2ad30d852716efcc4656a7516904570cd8631a49a3ce57c10225adf5d0cbdcb47f6b0255fe6557c453925a15 checksum: 62b5628bff67c0eb0b66afa371bd73e230399a8d2ad30d852716efcc4656a7516904570cd8631a49a3ce57c10225adf5d0cbdcb47f6b0255fe6557c453925a15