✨ webdav云同步

Author: CodFrm

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scriptcat",
-  "version": "0.10.0-alpha",
+  "version": "0.10.0-alpha.1",
   "description": "脚本猫,一个可以执行用户脚本的浏览器扩展,万物皆可脚本化,让你的浏览器可以做更多的事情!",
   "author": "CodFrm",
   "license": "GPLv3",

pkg/filesystem/factory.ts

@@ -14,21 +14,23 @@ export type FileSystemParams = {
 
 export default class FileSystemFactory {
   static create(type: FileSystemType, params: any): Promise<FileSystem> {
+    let fs: FileSystem;
     switch (type) {
       case "zip":
-        return Promise.resolve(new ZipFileSystem(params));
+        fs = new ZipFileSystem(params);
+        break;
       case "webdav":
-        return Promise.resolve(
-          new WebDAVFileSystem(
-            params.authType,
-            params.url,
-            params.username,
-            params.password
-          )
+        fs = new WebDAVFileSystem(
+          params.authType,
+          params.url,
+          params.username,
+          params.password
         );
+        break;
       default:
         throw new Error("not found filesystem");
     }
+    return fs.verify().then(() => fs);
   }
 
   static params(): { [key: string]: FileSystemParams } {

pkg/filesystem/filesystem.ts

@@ -5,6 +5,8 @@ export interface File {
   path: string;
   // 文件大小
   size: number;
+  // 文件摘要
+  digest: string;
   // 文件创建时间
   createtime: number;
   // 文件修改时间
@@ -25,6 +27,8 @@ export type FileReadWriter = FileReader & FileWriter;
 
 // 文件读取
 export default interface FileSystem {
+  // 授权验证
+  verify(): Promise<void>;
   // 打开文件
   open(path: string): Promise<FileReader>;
   // 创建文件

pkg/filesystem/webdav/webdav.ts

@@ -18,6 +18,11 @@ export default class WebDAVFileSystem implements FileSystem {
     });
   }
 
+  async verify(): Promise<void> {
+    await this.client.getQuota();
+    return Promise.resolve();
+  }
+
   open(path: string): Promise<FileReader> {
     return Promise.resolve(new WebDAVFileReader(this.client, path));
   }
@@ -36,7 +41,7 @@ export default class WebDAVFileSystem implements FileSystem {
     )) as FileStat[];
     const ret: File[] = [];
     dir.forEach((item: FileStat) => {
-      if (item.type !== "file" || !item.basename.endsWith(".zip")) {
+      if (item.type !== "file") {
         return;
       }
       ret.push({
@@ -45,6 +50,7 @@ export default class WebDAVFileSystem implements FileSystem {
           0,
           item.filename.length - item.basename.length
         ),
+        digest: item.etag || "",
         size: item.size,
         createtime: new Date(item.lastmod).getTime(),
         updatetime: new Date(item.lastmod).getTime(),

pkg/filesystem/zip/zip.ts

@@ -14,6 +14,10 @@ export default class ZipFileSystem implements FileSystem {
     this.zip = zip || new JSZip();
   }
 
+  verify(): Promise<void> {
+    return Promise.resolve();
+  }
+
   open(path: string): Promise<FileReader> {
     const file = this.zip.file(path);
     if (file) {
@@ -41,6 +45,7 @@ export default class ZipFileSystem implements FileSystem {
         name: key,
         path: key,
         size: 0,
+        digest: "",
         createtime: this.zip.files[key].date.getTime(),
         updatetime: this.zip.files[key].date.getTime(),
       });

src/app/logger/logger.ts

@@ -36,6 +36,9 @@ export default class Logger {
       this.core.writer.write(level, message, buildLabel(this.label, label));
     }
     if (this.core.debug) {
+      if (typeof message === "object") {
+        message = JSON.stringify(message);
+      }
       const msg = `${dayjs(new Date()).format(
         "YYYY-MM-DD HH:mm:ss"
       )} [${level}] msg=${message} label=${JSON.stringify(

src/app/service/script/event.ts

@@ -4,6 +4,7 @@ import CacheKey from "@App/pkg/utils/cache_key";
 import Cache from "../../cache";
 import {
   Script,
+  SCRIPT_RUN_STATUS_COMPLETE,
   SCRIPT_STATUS_DISABLE,
   SCRIPT_STATUS_ENABLE,
   ScriptDAO,
@@ -90,6 +91,7 @@ export default class ScriptEventListener {
           }
           if (script.status !== SCRIPT_STATUS_ENABLE) {
             script.status = SCRIPT_STATUS_ENABLE;
+            script.updatetime = new Date().getTime();
             this.dao.save(script);
             logger.info("enable script");
             ScriptManager.hook.trigger("enable", script);
@@ -115,6 +117,7 @@ export default class ScriptEventListener {
           }
           if (script.status === SCRIPT_STATUS_ENABLE) {
             script.status = SCRIPT_STATUS_DISABLE;
+            script.updatetime = new Date().getTime();
             this.dao.save(script);
             logger.info("disable script");
             ScriptManager.hook.trigger("disable", script);