♻️ websocketの函数のほうを変換し忘れていた

Author: takker99

browser/websocket/_fetch.ts

@@ -22,11 +22,11 @@ export type PushCommitInit = {
   userId: string;
 };
 
-export async function pushCommit(
+export const pushCommit = async (
   request: RequestFunc,
   changes: Change[] | [Delete] | [Pin],
   commitInit: PushCommitInit,
-) {
+) => {
   if (changes.length === 0) return { commitId: commitInit.parentId };
   const res = await request("socket.io-request", {
     method: "commit",
@@ -39,9 +39,9 @@ export async function pushCommit(
     },
   });
   return res as { commitId: string };
-}
+};
 
-export async function pushWithRetry(
+export const pushWithRetry = async (
   request: RequestFunc,
   changes: Change[] | [Delete] | [Pin],
   { project, title, retry = 3, parentId, ...commitInit }:
@@ -51,7 +51,7 @@ export async function pushWithRetry(
       title: string;
       retry?: number;
     },
-) {
+) => {
   try {
     const res = await pushCommit(request, changes, {
       parentId,
@@ -78,4 +78,4 @@ export async function pushWithRetry(
     throw Error("Faild to retry pushing.");
   }
   return parentId;
-}
+};

browser/websocket/applyCommit.ts

@@ -1,5 +1,5 @@
 import type { CommitNotification } from "../../deps/socket.ts";
-import type { Line } from "../../deps/scrapbox.ts";
+import type { Line } from "../../deps/scrapbox-rest.ts";
 import { getUnixTimeFromId } from "./id.ts";
 
 export interface ApplyCommitProp {
@@ -17,11 +17,11 @@ export interface ApplyCommitProp {
  * @param lines commitsを適用する行
  * @param changes 適用するcommits
  */
-export function applyCommit(
+export const applyCommit = (
   lines: readonly Line[],
   changes: CommitNotification["changes"],
   { updated, userId }: ApplyCommitProp,
-) {
+): Line[] => {
   const newLines = [...lines];
   const getPos = (lineId: string) => {
     const position = newLines.findIndex(({ id }) => id === lineId);
@@ -57,4 +57,4 @@ export function applyCommit(
     }
   }
   return newLines;
-}
+};

browser/websocket/deletePage.ts

@@ -14,11 +14,11 @@ export interface DeletePageOptions {
  * @param title 削除したいページのタイトル
  * @param options 使用したいSocketがあれば指定する
  */
-export async function deletePage(
+export const deletePage = async (
   project: string,
   title: string,
   options?: DeletePageOptions,
-): Promise<void> {
+): Promise<void> => {
   const [
     { pageId, commitId: parentId, persistent },
     projectId,
@@ -47,4 +47,4 @@ export async function deletePage(
   } finally {
     if (!injectedSocket) await disconnect(socket);
   }
-}
+};

browser/websocket/diff.ts

@@ -36,10 +36,10 @@ export interface DiffResult<T> {
   buildSES(): Generator<Change<T>, void, unknown>;
 }
 
-export function diff<T>(
+export const diff = <T>(
   left: ArrayLike<T>,
   right: ArrayLike<T>,
-): DiffResult<T> {
+): DiffResult<T> => {
   const reversed = left.length > right.length;
   const a = reversed ? right : left;
   const b = reversed ? left : right;
@@ -114,7 +114,7 @@ export function diff<T>(
       }
     },
   };
-}
+};
 
 export function* toExtendedChanges<T>(
   changes: Iterable<Change<T>>,
@@ -165,16 +165,14 @@ export function* toExtendedChanges<T>(
   yield* flush();
 }
 
-function makeReplaced<T>(
+const makeReplaced = <T>(
   left: Added<T>,
   right: Deleted<T>,
-): Replaced<T> {
-  return {
-    value: left.value,
-    oldValue: right.value,
-    type: "replaced",
-  };
-}
+): Replaced<T> => ({
+  value: left.value,
+  oldValue: right.value,
+  type: "replaced",
+});
 
 function* reverse<T>(list: ArrayLike<T>) {
   for (let i = list.length - 1; i >= 0; i--) {

browser/websocket/id.ts

@@ -3,7 +3,7 @@ import { getProfile } from "../../rest/profile.ts";
 
 /** cached user ID */
 let userId: string | undefined;
-export async function getUserId() {
+export const getUserId = async (): Promise<string> => {
   if (userId !== undefined) return userId;
 
   const user = await getProfile();
@@ -12,11 +12,11 @@ export async function getUserId() {
   }
   userId = user.id;
   return userId;
-}
+};
 
 /** cached pairs of project name and project id */
 const projectMap = new Map<string, string>();
-export async function getProjectId(project: string) {
+export const getProjectId = async (project: string): Promise<string> => {
   const cachedId = projectMap.get(project);
   if (cachedId !== undefined) return cachedId;
 
@@ -28,22 +28,18 @@ export async function getProjectId(project: string) {
   const { id } = result.value;
   projectMap.set(project, id);
   return id;
-}
+};
 
-function zero(n: string) {
-  return n.padStart(8, "0");
-}
+const zero = (n: string) => n.padStart(8, "0");
 
-export function createNewLineId(userId: string) {
+export const createNewLineId = (userId: string): string => {
   const time = Math.floor(new Date().getTime() / 1000).toString(16);
   const rand = Math.floor(0xFFFFFE * Math.random()).toString(16);
   return `${zero(time).slice(-8)}${userId.slice(-6)}0000${zero(rand)}`;
-}
-export function getUnixTimeFromId(id: string) {
+};
+export const getUnixTimeFromId = (id: string): number => {
   if (!isId(id)) throw SyntaxError(`"${id}" is an invalid id.`);
 
   return parseInt(`0x${id.slice(0, 8)}`, 16);
-}
-export function isId(id: string) {
-  return /^[a-f\d]{24,32}$/.test(id);
-}
+};
+export const isId = (id: string): boolean => /^[a-f\d]{24,32}$/.test(id);

browser/websocket/makeChanges.ts

@@ -15,11 +15,11 @@ export interface Init {
   userId: string;
   head: HeadData;
 }
-export function makeChanges(
+export const makeChanges = (
   left: Pick<Line, "text" | "id">[],
   right: string[],
   { userId, head }: Init,
-) {
+): Change[] => {
   // 改行文字が入るのを防ぐ
   const right_ = right.flatMap((text) => text.split("\n"));
   // 本文の差分
@@ -51,10 +51,10 @@ export function makeChanges(
   }
 
   return changes;
-}
+};
 
 /** テキストに含まれる全てのリンクと最初の画像を探す */
-function findLinksAndImage(text: string): [string[], string | null] {
+const findLinksAndImage = (text: string): [string[], string | null] => {
   const rows = parseToRows(text);
   const blocks = packRows(rows, { hasTitle: true }).flatMap((pack) => {
     switch (pack.type) {
@@ -115,7 +115,7 @@ function findLinksAndImage(text: string): [string[], string | null] {
   }
 
   return [links, image];
-}
+};
 
 function* blocksToNodes(blocks: Iterable<Block>) {
   for (const block of blocks) {

browser/websocket/patch.ts

@@ -19,15 +19,15 @@ export interface PatchOptions {
  * @param update 書き換え後の本文を作成する函数。引数には現在の本文が渡される。空配列を返すとページが削除される。undefinedを返すと書き換えを中断する
  * @param options 使用したいSocketがあれば指定する
  */
-export async function patch(
+export const patch = async (
   project: string,
   title: string,
   update: (
     lines: Line[],
     metadata: HeadData,
   ) => string[] | undefined | Promise<string[] | undefined>,
   options?: PatchOptions,
-): Promise<void> {
+): Promise<void> => {
   const [
     head_,
     projectId,
@@ -90,4 +90,4 @@ export async function patch(
   } finally {
     if (!injectedSocket) await disconnect(socket);
   }
-}
+};

browser/websocket/pin.ts

@@ -21,11 +21,11 @@ export interface PinOptions {
  * @param title ピン留めしたいページのタイトル
  * @param options 使用したいSocketがあれば指定する
  */
-export async function pin(
+export const pin = async (
   project: string,
   title: string,
   options?: PinOptions,
-): Promise<void> {
+): Promise<void> => {
   const [
     head,
     projectId,
@@ -63,7 +63,7 @@ export async function pin(
   } finally {
     if (!injectedSocket) await disconnect(socket);
   }
-}
+};
 
 export interface UnPinOptions {
   socket?: Socket;
@@ -73,11 +73,11 @@ export interface UnPinOptions {
  * @param project ピン留めを外したいページのproject
  * @param title ピン留めを外したいページのタイトル
  */
-export async function unpin(
+export const unpin = async (
   project: string,
   title: string,
   options: UnPinOptions,
-): Promise<void> {
+): Promise<void> => {
   const [
     head,
     projectId,
@@ -109,7 +109,7 @@ export async function unpin(
   } finally {
     if (!injectedSocket) await disconnect(socket);
   }
-}
+};
 
 export const pinNumber = (): number =>
   Number.MAX_SAFE_INTEGER - Math.floor(Date.now() / 1000);

browser/websocket/pull.ts

@@ -10,7 +10,10 @@ export interface HeadData {
   links: string[];
   lines: Line[];
 }
-export async function pull(project: string, title: string): Promise<HeadData> {
+export const pull = async (
+  project: string,
+  title: string,
+): Promise<HeadData> => {
   const result = await getPage(project, title);
 
   // TODO: 編集不可なページはStream購読だけ提供する
@@ -28,4 +31,4 @@ export async function pull(project: string, title: string): Promise<HeadData> {
     pin,
     lines,
   };
-}
+};

browser/websocket/socket.ts

@@ -2,29 +2,27 @@ import { Socket, socketIO } from "../../deps/socket.ts";
 export type { Socket } from "../../deps/socket.ts";
 
 /** 新しいsocketを作る */
-export function makeSocket() {
-  return socketIO();
-}
+export const makeSocket = (): Promise<Socket> => socketIO();
 
 /** websocketに(再)接続する
  *
  * @param socket 接続したいsocket
  */
-export async function connect(socket: Socket): Promise<void> {
+export const connect = async (socket: Socket): Promise<void> => {
   if (socket.connected) return;
 
   const waiting = new Promise<void>((resolve) =>
     socket.once("connect", () => resolve())
   );
   socket.connect();
   await waiting;
-}
+};
 
 /** websocketを切断する
  *
  * @param socket 切断したいsocket
  */
-export async function disconnect(socket: Socket): Promise<void> {
+export const disconnect = async (socket: Socket): Promise<void> => {
   if (socket.disconnected) return;
 
   const waiting = new Promise<void>((resolve) => {
@@ -37,4 +35,4 @@ export async function disconnect(socket: Socket): Promise<void> {
   });
   socket.disconnect();
   await waiting;
-}
+};