Merge pull request #11 from takker99/refactor-pull

Use `pull` for getting HEAD info

Author: takker99

browser/websocket/_fetch.ts

@@ -7,7 +7,7 @@ import {
   ProjectUpdatesStreamEvent,
   wrap,
 } from "../../deps/socket.ts";
-import { getPage } from "../../rest/pages.ts";
+import { pull } from "./pull.ts";
 export type {
   CommitNotification,
   ProjectUpdatesStreamCommit,
@@ -61,7 +61,7 @@ export async function pushWithRetry(
   } catch (_e) {
     console.log("Faild to push a commit. Retry after pulling new commits");
     for (let i = 0; i < retry; i++) {
-      const { commitId } = await ensureEditablePage(project, title);
+      const { commitId } = await pull(project, title);
       parentId = commitId;
       try {
         const res = await pushCommit(request, changes, {
@@ -79,13 +79,3 @@ export async function pushWithRetry(
   }
   return parentId;
 }
-
-export async function ensureEditablePage(project: string, title: string) {
-  const result = await getPage(project, title);
-
-  // TODO: 編集不可なページはStream購読だけ提供する
-  if (!result.ok) {
-    throw new Error(`You have no privilege of editing "/${project}/${title}".`);
-  }
-  return result.value;
-}

browser/websocket/makeChanges.ts

@@ -8,15 +8,9 @@ import {
   parseToRows,
 } from "../../deps/scrapbox.ts";
 import type { Change } from "../../deps/socket.ts";
+import type { HeadData } from "./pull.ts";
 import { toTitleLc } from "../../title.ts";
 
-export interface HeadData {
-  commitId: string;
-  persistent: boolean;
-  image: string | null;
-  linksLc: string[];
-  lines: Line[];
-}
 export interface Init {
   userId: string;
   head: HeadData;

browser/websocket/pull.ts

@@ -0,0 +1,32 @@
+import type { Line } from "../../deps/scrapbox.ts";
+import { toTitleLc } from "../../title.ts";
+import { getPage } from "../../rest/pages.ts";
+
+export interface HeadData {
+  commitId: string;
+  pageId: string;
+  persistent: boolean;
+  image: string | null;
+  pin: number;
+  linksLc: string[];
+  lines: Line[];
+}
+export async function pull(project: string, title: string): Promise<HeadData> {
+  const result = await getPage(project, title);
+
+  // TODO: 編集不可なページはStream購読だけ提供する
+  if (!result.ok) {
+    throw new Error(`You have no privilege of editing "/${project}/${title}".`);
+  }
+  const { commitId, persistent, image, links, lines, id, pin } = result.value;
+
+  return {
+    commitId,
+    pageId: id,
+    persistent,
+    image,
+    linksLc: links.map((link) => toTitleLc(link)),
+    pin,
+    lines,
+  };
+}

browser/websocket/room.ts

@@ -1,10 +1,10 @@
 import { CommitNotification, socketIO, wrap } from "../../deps/socket.ts";
 import { getProjectId, getUserId } from "./id.ts";
 import { applyCommit } from "./applyCommit.ts";
-import { toTitleLc } from "../../title.ts";
 import { makeChanges } from "./makeChanges.ts";
+import { pull } from "./pull.ts";
 import type { Line } from "../../deps/scrapbox.ts";
-import { ensureEditablePage, pushCommit } from "./_fetch.ts";
+import { pushCommit } from "./_fetch.ts";
 export type { CommitNotification };
 
 export interface JoinPageRoomResult {
@@ -34,30 +34,23 @@ export async function joinPageRoom(
   title: string,
 ): Promise<JoinPageRoomResult> {
   const [
-    page,
+    head_,
     projectId,
     userId,
   ] = await Promise.all([
-    ensureEditablePage(project, title),
+    pull(project, title),
     getProjectId(project),
     getUserId(),
   ]);
 
   // 接続したページの情報
-  let head = {
-    persistent: page.persistent,
-    lines: page.lines,
-    image: page.image,
-    commitId: page.commitId,
-    linksLc: page.links.map((link) => toTitleLc(link)),
-  };
-  const pageId = page.id;
+  let head = head_;
 
   const io = await socketIO();
   const { request, response } = wrap(io);
   await request("socket.io-request", {
     method: "room:join",
-    data: { projectId, pageId, projectUpdatesStream: false },
+    data: { projectId, pageId: head.pageId, projectUpdatesStream: false },
   });
 
   // subscribe the latest commit
@@ -82,7 +75,7 @@ export async function joinPageRoom(
           const { commitId } = await pushCommit(request, changes, {
             parentId: head.commitId,
             projectId,
-            pageId,
+            pageId: head.pageId,
             userId,
           });
 
@@ -102,14 +95,7 @@ export async function joinPageRoom(
             "Faild to push a commit. Retry after pulling new commits",
           );
           try {
-            const page = await ensureEditablePage(project, title);
-            head = {
-              persistent: page.persistent,
-              lines: page.lines,
-              image: page.image,
-              commitId: page.commitId,
-              linksLc: page.links.map((link) => toTitleLc(link)),
-            };
+            head = await pull(project, title);
           } catch (e: unknown) {
             throw e;
           }

browser/websocket/shortcuts.ts

@@ -1,10 +1,10 @@
 import { socketIO, wrap } from "../../deps/socket.ts";
 import { getProjectId, getUserId } from "./id.ts";
 import { makeChanges } from "./makeChanges.ts";
+import { pull } from "./pull.ts";
 import { pinNumber } from "./pin.ts";
 import type { Line } from "../../deps/scrapbox.ts";
-import { toTitleLc } from "../../title.ts";
-import { ensureEditablePage, pushCommit, pushWithRetry } from "./_fetch.ts";
+import { pushCommit, pushWithRetry } from "./_fetch.ts";
 
 /** 指定したページを削除する
  *
@@ -16,23 +16,22 @@ export async function deletePage(
   title: string,
 ): Promise<void> {
   const [
-    { id: pageId, commitId: initialCommitId, persistent },
+    { pageId, commitId: parentId, persistent },
     projectId,
     userId,
   ] = await Promise.all([
-    ensureEditablePage(project, title),
+    pull(project, title),
     getProjectId(project),
     getUserId(),
   ]);
-  let parentId = initialCommitId;
 
   if (!persistent) return;
 
   const io = await socketIO();
   const { request } = wrap(io);
 
   try {
-    parentId = await pushWithRetry(request, [{ deleted: true }], {
+    await pushWithRetry(request, [{ deleted: true }], {
       projectId,
       pageId,
       parentId,
@@ -59,23 +58,16 @@ export async function patch(
   update: (lines: Line[]) => string[] | Promise<string[]>,
 ): Promise<void> {
   const [
-    page,
+    head_,
     projectId,
     userId,
   ] = await Promise.all([
-    ensureEditablePage(project, title),
+    pull(project, title),
     getProjectId(project),
     getUserId(),
   ]);
 
-  let head = {
-    persistent: page.persistent,
-    lines: page.lines,
-    image: page.image,
-    commitId: page.commitId,
-    linksLc: page.links.map((link) => toTitleLc(link)),
-  };
-  const pageId = page.id;
+  let head = head_;
 
   const io = await socketIO();
   try {
@@ -91,7 +83,7 @@ export async function patch(
         await pushCommit(request, changes, {
           parentId: head.commitId,
           projectId,
-          pageId,
+          pageId: head.pageId,
           userId,
         });
         break;
@@ -103,14 +95,7 @@ export async function patch(
           "Faild to push a commit. Retry after pulling new commits",
         );
         try {
-          const page = await ensureEditablePage(project, title);
-          head = {
-            persistent: page.persistent,
-            lines: page.lines,
-            image: page.image,
-            commitId: page.commitId,
-            linksLc: page.links.map((link) => toTitleLc(link)),
-          };
+          head = await pull(project, title);
         } catch (e: unknown) {
           throw e;
         }
@@ -142,36 +127,37 @@ export async function pin(
   option?: PinOption,
 ): Promise<void> {
   const [
-    { id: pageId, commitId: initialCommitId, persistent, pin },
+    head,
     projectId,
     userId,
   ] = await Promise.all([
-    ensureEditablePage(project, title),
+    pull(project, title),
     getProjectId(project),
     getUserId(),
   ]);
-  let parentId = initialCommitId;
 
   // 既にピン留めされている場合は何もしない
-  if (pin > 0 || (!persistent && !(option?.create ?? false))) return;
+  if (head.pin > 0 || (!head.persistent && !(option?.create ?? false))) return;
 
-  const init = { projectId, pageId, userId, project, title };
+  const init = {
+    parentId: head.commitId,
+    projectId,
+    pageId: head.pageId,
+    userId,
+    project,
+    title,
+  };
   const io = await socketIO();
   const { request } = wrap(io);
 
   // タイトルのみのページを作る
-  if (!persistent) {
-    parentId = await pushWithRetry(request, [{ title }], {
-      parentId,
-      ...init,
-    });
+  if (!head.persistent) {
+    const commitId = await pushWithRetry(request, [{ title }], init);
+    init.parentId = commitId;
   }
 
   try {
-    parentId = await pushWithRetry(request, [{ pin: pinNumber() }], {
-      parentId,
-      ...init,
-    });
+    await pushWithRetry(request, [{ pin: pinNumber() }], init);
   } finally {
     io.disconnect();
   }
@@ -186,28 +172,31 @@ export async function unpin(
   title: string,
 ): Promise<void> {
   const [
-    { id: pageId, commitId: initialCommitId, persistent, pin },
+    head,
     projectId,
     userId,
   ] = await Promise.all([
-    ensureEditablePage(project, title),
+    pull(project, title),
     getProjectId(project),
     getUserId(),
   ]);
-  let parentId = initialCommitId;
 
   // 既にピンが外れているか、そもそも存在しないページの場合は何もしない
-  if (pin == 0 || !persistent) return;
+  if (head.pin == 0 || !head.persistent) return;
 
-  const init = { projectId, pageId, userId, project, title };
+  const init = {
+    parentId: head.commitId,
+    projectId,
+    pageId: head.pageId,
+    userId,
+    project,
+    title,
+  };
   const io = await socketIO();
   const { request } = wrap(io);
 
   try {
-    parentId = await pushWithRetry(request, [{ pin: 0 }], {
-      parentId,
-      ...init,
-    });
+    await pushWithRetry(request, [{ pin: 0 }], init);
   } finally {
     io.disconnect();
   }