socket 断线自动重连，文件上传功能

hydro/model/file.ts

@@ -13,20 +13,25 @@ function _timestamp() {
     return Math.floor(Number(new Date()) / 1000000);
 }
 
-export async function add(streamOrPath: fs.ReadStream | string, filename: string, meta = {}) {
+export async function add(
+    streamOrPath: fs.ReadStream | string, filename: string,
+    owner = 1, meta = {},
+) {
     let stream: fs.ReadStream;
     if (typeof streamOrPath === 'string') stream = fs.createReadStream(streamOrPath);
     else stream = streamOrPath;
     const w = gridfs.openUploadStream(filename);
-    await coll.insertOne({ ...meta, _id: w.id, secret: String.random(32) });
+    await coll.insertOne({
+        ...meta, _id: w.id, secret: String.random(32), owner, filename,
+    });
     await new Promise((resolve, reject) => {
         w.on('error', reject);
         w.on('finish', resolve);
         stream.pipe(w);
     });
     const c = await gridfs.find({ _id: w.id }).toArray();
-    await coll.updateOne({ _id: w.id }, { $set: { md5: c[0].md5, size: c[0].size } });
-    return w.id;
+    await coll.updateOne({ _id: w.id }, { $set: { md5: c[0].md5, size: c[0].length } });
+    return w.id as ObjectID;
 }
 
 export function del(_id: ObjectID) {
@@ -92,13 +97,26 @@ export function getMulti(query: any) {
     return coll.find(query);
 }
 
-export async function url(_id: ObjectID, name: string | undefined) {
+async function _url(_id: ObjectID, name: string | undefined) {
     const file = await coll.findOne({ _id });
     const secret = hash(file.secret, _timestamp().toString());
     if (name) return `/fs/${_id}/${Buffer.from(name).toString('base64')}/${secret}`;
     return `/fs/${_id}/${secret}`;
 }
 
+function __url(file: any, name: string | undefined) {
+    const secret = hash(file.secret, _timestamp().toString());
+    if (name) return `/fs/${file._id}/${Buffer.from(name).toString('base64')}/${secret}`;
+    return `/fs/${file._id}/${secret}`;
+}
+
+export function url(_id: ObjectID, name: string | undefined): Promise<string>;
+export function url(file: any, name: string | undefined): string;
+export function url(arg0: any, name: any) {
+    if (arg0 instanceof ObjectID) return _url(arg0, name);
+    return __url(arg0, name);
+}
+
 global.Hydro.model.file = {
     add, get, del, inc, dec, getMeta, getWithSecret, getMulti, getMetaDict, url,
 };

hydro/model/setting.ts

@@ -99,6 +99,7 @@ AccountSetting(
     Setting('setting_customize', 'backgroundImage', null,
         '/components/profile/backgrounds/1.jpg', 'text', 'Profile Background Image',
         'Choose the background image in your profile page.'),
+    Setting('setting_storage', 'usage', null, 0, 'number', 'Userfile Usage', null, FLAG_DISABLED | FLAG_HIDDEN),
 );
 
 DomainSetting(
@@ -118,7 +119,6 @@ SystemSetting(
     Setting('setting_smtp', 'smtp.port', null, 465, 'number', 'SMTP Server Port'),
     Setting('setting_smtp', 'smtp.from', null, null, 'text', 'Mail From'),
     Setting('setting_smtp', 'smtp.secure', null, false, 'boolean', 'SSL'),
-    Setting('setting_db', 'db.ver', null, 1, 'number', 'Database version', null, FLAG_DISABLED | FLAG_HIDDEN),
     Setting('setting_server', 'server.worker', null, 1, 'number', 'Server Workers Number'),
     Setting('setting_server', 'server.hostname', null, null, 'text', 'Server Hostname'),
     Setting('setting_server', 'server.host', null, null, 'text', 'Server Host'),
@@ -154,6 +154,8 @@ SystemSetting(
     Setting('setting_constant', 'DISCUSSION_ON_MAIN', null, 20, 'number', 'DISCUSSION_ON_MAIN'),
     Setting('setting_constant', 'CONTEST_ON_MAIN', null, 10, 'number', 'CONTEST_ON_MAIN'),
     Setting('setting_constant', 'TRAINING_ON_MAIN', null, 10, 'number', 'TRAINING_ON_MAIN'),
+    Setting('setting_storage', 'db.ver', null, 1, 'number', 'Database version', null, FLAG_DISABLED | FLAG_HIDDEN),
+    Setting('setting_storage', 'user', null, 1, 'number', 'User Counter', null, FLAG_DISABLED | FLAG_HIDDEN),
 );
 
 global.Hydro.postInit.push(

hydro/model/user.ts

@@ -68,14 +68,14 @@ export class User implements Udoc {
 
         for (const key in setting.SETTINGS_BY_KEY) {
             if (udoc[key]) this[key] = udoc[key];
-            else if (setting.SETTINGS_BY_KEY[key].value) {
+            else if (setting.SETTINGS_BY_KEY[key].value !== null) {
                 this[key] = setting.SETTINGS_BY_KEY[key].value;
             }
         }
 
         for (const key in setting.DOMAIN_USER_SETTINGS_BY_KEY) {
             if (dudoc[key]) this[key] = dudoc[key];
-            else if (setting.DOMAIN_USER_SETTINGS_BY_KEY[key].value) {
+            else if (setting.DOMAIN_USER_SETTINGS_BY_KEY[key].value !== null) {
                 this[key] = setting.DOMAIN_USER_SETTINGS_BY_KEY[key].value;
             }
         }