-
+
+
## 特点
diff --git a/apps/electron/package.json b/apps/electron/package.json
index 76f6845f..84bab3ce 100644
--- a/apps/electron/package.json
+++ b/apps/electron/package.json
@@ -17,7 +17,6 @@
"clean:dist": "git clean -xdf dist",
"dev": "electron-vite dev",
"format": "prettier --check \"**/*.{mjs,ts,md,json}\"",
- "postinstall": "electron-builder install-app-deps",
"lint": "eslint .",
"start": "electron-vite preview",
"typecheck": "pnpm typecheck:node && pnpm typecheck:web",
diff --git a/apps/electron/src/main/index.ts b/apps/electron/src/main/index.ts
index 9b3d4892..cca8df60 100644
--- a/apps/electron/src/main/index.ts
+++ b/apps/electron/src/main/index.ts
@@ -20,6 +20,23 @@ const caller = router.createCaller({});
const controller = new AbortController();
const { signal } = controller;
+// 获取端口
+async function initConfig() {
+ const config = await caller.config.get();
+
+ const staticServerPort =
+ config?.staticServerPort ??
+ (await getPort({ port: portNumbers(9100, 9300) }));
+ const themeServerPort =
+ config?.themeServerPort ??
+ (await getPort({ port: portNumbers(9301, 9500) }));
+
+ return await caller.config.upsert({
+ staticServerPort,
+ themeServerPort,
+ });
+}
+
function createWindow(): void {
// Create the browser window.
const mainWindow = new BrowserWindow({
@@ -74,57 +91,38 @@ function createWindow(): void {
// Some APIs can only be used after this event occurs.
app
.whenReady()
- .then(() => {
+ .then(async () => {
// Set app user model id for windows
electronApp.setAppUserModelId("com.rao-pics");
- Promise.all([caller.library.get(), caller.config.get()])
- .then(async (res) => {
- const [library, config] = res;
- // 启动静态资源服务器
- if (library?.path && config?.staticServerPort) {
- void startStaticServer(
- join(library.path, "images"),
- config.staticServerPort,
- );
- }
-
- // 启动主题服务器
- const themeServerPort =
- config?.themeServerPort ??
- (await getPort({ port: portNumbers(9301, 9500) }));
-
- if (IS_DEV) {
- // TODO: xxx
- // dialog.showErrorBox("IS_DEV", IS_DEV + "");
- } else {
- const child = cp.fork(
- join(
- process.resourcesPath,
- "themes",
- config?.theme ?? DEFAULT_THEME,
- "server.js",
- ),
- ["child"],
- {
- env: { PORT: themeServerPort.toString(), HOSTNAME: "0.0.0.0" },
- signal,
- },
- );
-
- child.on("error", (e) => {
- dialog.showErrorBox("child process fork error", e.message);
- controller.abort();
- });
- }
-
- void caller.config.upsert({
- themeServerPort,
- });
- })
- .catch((e) => {
- throw e;
+ const config = await initConfig();
+ // 启动静态资源服务器
+ await startStaticServer();
+
+ const { themeServerPort } = config;
+
+ if (!themeServerPort) return;
+
+ if (!IS_DEV) {
+ const child = cp.fork(
+ join(
+ process.resourcesPath,
+ "themes",
+ config?.theme ?? DEFAULT_THEME,
+ "server.js",
+ ),
+ ["child"],
+ {
+ env: { PORT: themeServerPort.toString(), HOSTNAME: "0.0.0.0" },
+ signal,
+ },
+ );
+
+ child.on("error", (e) => {
+ dialog.showErrorBox("child process fork error", e.message);
+ controller.abort();
});
+ }
// Default open or close DevTools by F12 in development
// and ignore CommandOrControl + R in production.
diff --git a/packages/api/src/image.ts b/packages/api/src/image.ts
index d3dc6483..62a8edc4 100644
--- a/packages/api/src/image.ts
+++ b/packages/api/src/image.ts
@@ -42,11 +42,11 @@ export const image = t.router({
width: z.number(),
height: z.number(),
mtime: z.date(),
- thumbnailPath: z.string().optional(),
duration: z.number().optional(),
annotation: z.string().optional(),
url: z.string().optional(),
isDeleted: z.boolean().optional(),
+ blurDataURL: z.string().optional(),
tags: z
.object({
connect: z.array(z.string()).optional(),
@@ -76,12 +76,12 @@ export const image = t.router({
ext: input.ext,
width: input.width,
height: input.height,
- thumbnailPath: input.thumbnailPath,
duration: input.duration,
annotation: input.annotation,
url: input.url,
mtime: input.mtime,
isDeleted: input.isDeleted,
+ blurDataURL: input.blurDataURL,
};
const { tags, id, colors, folders } = input;
@@ -137,6 +137,50 @@ export const image = t.router({
return res;
}),
+ update: t.procedure
+ .input(
+ z
+ .object({
+ id: z.number().optional(),
+ path: z.string().optional(),
+ name: z.string().optional(),
+ size: z.number().optional(),
+ ext: z.string().optional(),
+ width: z.number().optional(),
+ height: z.number().optional(),
+ mtime: z.date().optional(),
+ duration: z.number().optional(),
+ annotation: z.string().optional(),
+ url: z.string().optional(),
+ isDeleted: z.boolean().optional(),
+ blurDataURL: z.string().optional(),
+ })
+ .partial()
+ .refine(
+ (data) => !!data.id || !!data.path,
+ "id or path either one is required",
+ ),
+ )
+ .mutation(async ({ input }) => {
+ const { id, path, ...data } = input;
+ if (id) {
+ return prisma.image.update({
+ where: { id },
+ data: {
+ ...data,
+ path,
+ },
+ });
+ }
+
+ if (path) {
+ return prisma.image.update({
+ where: { path },
+ data,
+ });
+ }
+ }),
+
deleteByUnique: t.procedure
.input(
z
diff --git a/packages/api/src/library.ts b/packages/api/src/library.ts
index c37eadd9..e49a73ee 100644
--- a/packages/api/src/library.ts
+++ b/packages/api/src/library.ts
@@ -46,24 +46,16 @@ export const library = t.router({
throw new Error("Cannot add more than one library.");
}
- const caller = router.createCaller({});
- const config = await caller.config.get();
-
- const port = await startStaticServer(
- input,
- config?.staticServerPort ?? undefined,
- );
-
- if (port) {
- await caller.config.upsert({ staticServerPort: port });
- }
-
- return await prisma.library.create({
+ const lib = await prisma.library.create({
data: {
path: input,
type: "eagle",
},
});
+
+ await startStaticServer();
+
+ return lib;
}),
update: t.procedure
diff --git a/packages/api/test/library.test.ts b/packages/api/test/library.test.ts
index 418a9ec3..74f03703 100644
--- a/packages/api/test/library.test.ts
+++ b/packages/api/test/library.test.ts
@@ -16,6 +16,12 @@ describe("library module", () => {
});
describe("add procedure", () => {
+ beforeEach(async () => {
+ await caller.config.upsert({
+ staticServerPort: 9100,
+ });
+ });
+
it("should create a new library when none exist", async () => {
const input = "path/to/xxx.library";
const result = await caller.library.add(input);
diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma
index 48c32a6f..c2512b78 100644
--- a/packages/db/prisma/schema.prisma
+++ b/packages/db/prisma/schema.prisma
@@ -45,41 +45,41 @@ model Pending {
}
model Image {
- id Int @id @unique @default(autoincrement())
- // library.path + path => originalPath
- path String @unique
+ id Int @id @unique @default(autoincrement())
+ // 完整地址
+ path String @unique
// 名字
- name String
+ name String
// 文件大小
- size Int
+ size Int
// 创建时间
- createdTime DateTime @default(now())
+ createdTime DateTime @default(now())
// 修改时间
- updateTime DateTime @updatedAt
+ updateTime DateTime @updatedAt
// 文件的 mtime
- mtime DateTime
+ mtime DateTime
// 扩展名
- ext String
+ ext String
// 宽度
- width Int
+ width Int
// 高度
- height Int
+ height Int
// 是否删除
- isDeleted Boolean @default(false)
- // UserData 缓存目录 + thumbnailPath => thumbnailPath
- thumbnailPath String?
+ isDeleted Boolean @default(false)
// 视频时长
- duration Float?
+ duration Float?
// 描述
- annotation String?
+ annotation String?
// 链接
- url String?
+ url String?
// 颜色
- colors Color[]
+ colors Color[]
// 文件夹
- folders Folder[]
+ folders Folder[]
// 标签
- tags Tag[]
+ tags Tag[]
+ // blurDataURL Base64
+ blurDataURL String?
}
model Tag {
diff --git a/packages/static-server/dev.ts b/packages/static-server/dev.ts
deleted file mode 100644
index f396b4bd..00000000
--- a/packages/static-server/dev.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { startStaticServer } from "./src";
-
-void (async () => {
- await startStaticServer("/Users/meetqy/Pictures/test.library/images", 4000);
-})();
diff --git a/packages/static-server/package.json b/packages/static-server/package.json
index 0d601e30..2c591e77 100644
--- a/packages/static-server/package.json
+++ b/packages/static-server/package.json
@@ -9,7 +9,6 @@
"main": "./index.ts",
"scripts": {
"clean": "git clean -xdf .turbo node_modules",
- "dev": "ts-node ./dev.ts",
"format": "prettier --check \"**/*.{mjs,ts,md,json}\"",
"lint": "eslint .",
"typecheck": "tsc --noEmit"
@@ -21,8 +20,8 @@
]
},
"dependencies": {
+ "@rao-pics/api": "workspace:^",
"express": "^4.18.2",
- "get-port": "^7.0.0",
"plaiceholder": "^3.0.0",
"sharp": "^0.32.5"
},
@@ -34,7 +33,6 @@
"@types/node": "^18.17.6",
"@types/serve-static": "^1.15.2",
"eslint": "^8.47.0",
- "ts-node": "^10.9.1",
"typescript": "^5.1.6"
}
}
diff --git a/packages/static-server/src/index.ts b/packages/static-server/src/index.ts
index dfa8f630..f522e44f 100644
--- a/packages/static-server/src/index.ts
+++ b/packages/static-server/src/index.ts
@@ -3,9 +3,10 @@ import type { IncomingMessage, Server, ServerResponse } from "http";
import { join } from "path";
import type { NextFunction, Request, RequestHandler, Response } from "express";
import express from "express";
-import getPort, { portNumbers } from "get-port";
import { getPlaiceholder } from "plaiceholder";
+import { router } from "@rao-pics/api";
+
let server: Server