refactored little

frost-community · Apr 21, 2018 · 6798d60 · 6798d60
1 parent b2fcbcf
commit 6798d60
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 54 deletions.
diff --git a/src/client/index.js b/src/client/index.js
@@ -31,10 +31,9 @@ const fetchJson = require('./helpers/fetch-json');
 	if (mixin.getLoginStatus()) {
 		const secure = location.protocol == 'https:';
 
-		let webSocket;
 		try {
 			const accessToken = localStorage.getItem('accessToken');
-			webSocket = await WebSocketEvents.connect(`${secure ? 'wss' : 'ws'}://${mixin.config.apiHost}?access_token=${accessToken}`);
+			const webSocket = await WebSocketEvents.connect(`${secure ? 'wss' : 'ws'}://${mixin.config.apiHost}?access_token=${accessToken}`);
 			webSocket.addEventListener('close', (ev) => { console.log('close:', ev); });
 			webSocket.addEventListener('error', (ev) => { console.log('error:', ev); });
 			WebSocketEvents.init(webSocket);
@@ -50,9 +49,10 @@ const fetchJson = require('./helpers/fetch-json');
 			return;
 		}
 
-		const streamingRest = new StreamingRest(webSocket);
+		mixin.streamingRest = new StreamingRest(mixin.webSocket);
+
 		try {
-			const rest = await streamingRest.request('get', `/users/${mixin.userId}`);
+			const rest = await mixin.streamingRest.request('get', `/users/${mixin.userId}`);
 			mixin.user = rest.response.user;
 		}
 		catch (err) {

diff --git a/src/client/tags/frost-applications.tag b/src/client/tags/frost-applications.tag
@@ -36,7 +36,6 @@
 	</style>
 
 	<script>
-		const StreamingRest = require('../helpers/streaming-rest');
 		this.applications = [];
 		this.loading = true;
 		this.error = false;
@@ -50,8 +49,7 @@
 			this.central.on('add-application', centralAddApplicationHandler);
 
 			(async () => {
-				const streamingRest = new StreamingRest(this.webSocket);
-				const rest = await streamingRest.request('get', '/applications');
+				const rest = await this.streamingRest.request('get', '/applications');
 				if (rest.response.applications == null) {
 					if (rest.statusCode != 204) {
 						alert(`api error: failed to fetch list of appliations. ${rest.response.message}`);

diff --git a/src/client/tags/frost-follow-button.tag b/src/client/tags/frost-follow-button.tag
@@ -2,13 +2,9 @@
 	<button if={ showing } onclick={ follow }>{ following ? 'フォローしています' : 'フォロー' }</button>
 
 	<script>
-		const StreamingRest = require('../helpers/streaming-rest');
-
-		this.on('mount', () => {
-			(async () => {
-				const streamingRest = new StreamingRest(this.webSocket);
-
-				const rest = await streamingRest.request('get', `/users/${this.user.id}/followings/${this.opts.dataTargetId}`);
+		this.on('mount', async () => {
+			try {
+				const rest = await this.streamingRest.request('get', `/users/${this.user.id}/followings/${this.opts.dataTargetId}`);
 				if (rest.statusCode == 200) {
 					this.following = rest.response.following;
 					this.showing = true;
@@ -21,17 +17,16 @@
 					alert(`api error: ${rest.response.message}`);
 				}
 
-				this.follow = () => {
-					(async () => {
-						await streamingRest.request(this.following ? 'delete' : 'put', `/users/${this.user.id}/followings/${this.opts.dataTargetId}`);
-						this.following = !this.following;
-						this.update();
-					})();
+				this.follow = async () => {
+					await this.streamingRest.request(this.following ? 'delete' : 'put', `/users/${this.user.id}/followings/${this.opts.dataTargetId}`);
+					this.following = !this.following;
+					this.update();
 				};
 				this.update();
-			})().catch((err) => {
+			}
+			catch(err) {
 				console.error(err);
-			});
+			}
 		});
 
 	</script>

diff --git a/src/client/tags/frost-form-create-application.tag b/src/client/tags/frost-form-create-application.tag
@@ -34,7 +34,6 @@
 	</form>
 
 	<script>
-		const StreamingRest = require('../helpers/streaming-rest');
 		this.isShowModal = false;
 		let widgetId;
 
@@ -54,8 +53,7 @@
 				}
 
 				(async () => {
-					const streamingRest = new StreamingRest(this.webSocket);
-					const rest = await streamingRest.request('post', '/applications', {
+					const rest = await this.streamingRest.request('post', '/applications', {
 						body: {
 							name: this.refs.name.value,
 							description: this.refs.description.value,

diff --git a/src/client/tags/frost-form-create-status.tag b/src/client/tags/frost-form-create-status.tag
@@ -39,7 +39,6 @@
 	</style>
 
 	<script>
-		const StreamingRest = require('../helpers/streaming-rest');
 		this.textMax = 256;
 		this.text = '';
 		this.lock = false;
@@ -82,8 +81,7 @@
 
 			this.createStatus = () => {
 				(async () => {
-					const streamingRest = new StreamingRest(this.webSocket);
-					const rest = await streamingRest.request('post', '/posts/post_status', { body: { text: this.text } });
+					const rest = await this.streamingRest.request('post', '/posts/post_status', { body: { text: this.text } });
 					this.clear();
 					return 'success';
 				})().catch((err) => {

diff --git a/src/client/tags/frost-form-login.tag b/src/client/tags/frost-form-login.tag
@@ -24,15 +24,15 @@
 	<script>
 		const fetchJson = require('../helpers/fetch-json');
 
-		submit(e) {
+		async submit(e) {
 			e.preventDefault();
 
-			fetchJson('PUT', '/session', {
-				screenName: this.refs.screenName.value,
-				password: this.refs.password.value,
-				_csrf: this.csrf
-			})
-			.then(async (res) => {
+			try {
+				const res = await fetchJson('PUT', '/session', {
+					screenName: this.refs.screenName.value,
+					password: this.refs.password.value,
+					_csrf: this.csrf
+				})
 				const json = await res.json();
 
 				if (res.ok) {
@@ -44,10 +44,10 @@
 					const json = await res.json();
 					alert('ログインに失敗しました: ' + json.error.message);
 				}
-			})
-			.catch((reason) => {
-				alert('ログインに失敗しました: ' + reason);
-			});
+			}
+			catch (err) {
+				alert('ログインに失敗しました: ' + err);
+			}
 		}
 	</script>
 </frost-form-login>
diff --git a/src/client/tags/frost-page-user.tag b/src/client/tags/frost-page-user.tag
@@ -57,7 +57,6 @@
 	</style>
 
 	<script>
-		const StreamingRest = require('../helpers/streaming-rest');
 		this.user = null;
 		this.loading = true;
 
@@ -68,8 +67,7 @@
 
 				try {
 					// ユーザー情報をフェッチ
-					const streamingRest = new StreamingRest(this.webSocket);
-					const rest = await streamingRest.request('get', '/users', { query: { 'screen_names': params.screenName } });
+					const rest = await this.streamingRest.request('get', '/users', { query: { 'screen_names': params.screenName } });
 
 					this.user = rest.response.users[0];
 					this.loading = false;

diff --git a/src/client/tags/frost-page-userlist.tag b/src/client/tags/frost-page-userlist.tag
@@ -19,7 +19,6 @@
 	</style>
 
 	<script>
-		const StreamingRest = require('../helpers/streaming-rest');
 		this.users = [];
 		this.loading = true;
 
@@ -30,8 +29,7 @@
 
 				try {
 					// ユーザー情報をフェッチ
-					const streamingRest = new StreamingRest(this.webSocket);
-					const rest = await streamingRest.request('get', '/users');
+					const rest = await this.streamingRest.request('get', '/users');
 
 					this.users = rest.response.users;
 					this.loading = false;

diff --git a/src/client/tags/frost-tabs-user-page.tag b/src/client/tags/frost-tabs-user-page.tag
@@ -80,8 +80,6 @@
 	</style>
 
 	<script>
-		const StreamingRest = require('../helpers/streaming-rest');
-
 		if (this.opts.dataUser == null) {
 			throw new Error('data-user property is required');
 		}
@@ -103,12 +101,10 @@
 		}
 
 		this.on('mount', async () => {
-			const streamingRest = new StreamingRest(this.webSocket);
-
 			let restFollowings, restFollowers;
 			[restFollowings, restFollowers] = await Promise.all([
-				streamingRest.request('get', `/users/${this.user.id}/followings`, { query: { limit: 100 } }),
-				streamingRest.request('get', `/users/${this.user.id}/followers`, { query: { limit: 100 } })
+				this.streamingRest.request('get', `/users/${this.user.id}/followings`, { query: { limit: 100 } }),
+				this.streamingRest.request('get', `/users/${this.user.id}/followers`, { query: { limit: 100 } })
 			]);
 			this.followings = restFollowings.response.users;
 			this.followers = restFollowers.response.users;

diff --git a/src/client/tags/frost-timeline.tag b/src/client/tags/frost-timeline.tag
@@ -62,7 +62,6 @@
 	</style>
 
 	<script>
-		const StreamingRest = require('../helpers/streaming-rest');
 		this.timelinePosts = [];
 		this.loading = false;
 		this.error = false;
@@ -116,8 +115,7 @@
 			this.update();
 
 			(async () => {
-				const streamingRest = new StreamingRest(this.webSocket);
-				const rest = await streamingRest.request('get', endpoint, { query: { limit: 100 } });
+				const rest = await this.streamingRest.request('get', endpoint, { query: { limit: 100 } });
 				if (rest.response.posts == null) {
 					if (rest.statusCode != 204) {
 						alert(`api error: failed to fetch ${this.opts.dataName} timeline posts. ${rest.response.message}`);