isite 2022.9.17 → 2022.9.19

package/lib/sessions.js

@@ -48,20 +48,42 @@ module.exports = function init(____0) {
       return;
     }
 
-    sessions.list.forEach((s, i) => {
-      let online = new Date().getTime() - s.createdTime;
-      let timeout = 1000 * 60 * ____0.options.session.timeout;
-      if (online > timeout) {
-        sessions.list.splice(i, 1);
-      }
-    });
     if (____0.options.session.storage === 'mongodb') {
-      sessions.$collection.deleteAll({}, (err, docs) => {
-        sessions.$collection.insertAll(sessions.list, (err, docs) => {
-          callback(err, docs);
-        });
+      sessions.list.forEach((s, i) => {
+        if (!s) {
+          return false;
+        }
+        if (new Date().getTime() - s.createdTime > 1000 * 60 * ____0.options.session.timeout) {
+          sessions.list.splice(i, 1);
+          sessions.$collection.delete(s);
+        } else {
+          if (s.id) {
+            sessions.$collection.update(s, (err, result) => {
+              if (!err && result) {
+                sessions.list[i] = result.doc;
+              }
+            });
+          } else {
+            sessions.$collection.insert(s, (err, doc) => {
+              if (!err && doc) {
+                sessions.list[i] = doc;
+              }
+            });
+          }
+        }
       });
     } else {
+      sessions.list.forEach((s, i) => {
+        if (!s) {
+          return false;
+        }
+        let online = new Date().getTime() - s.createdTime;
+        let timeout = 1000 * 60 * ____0.options.session.timeout;
+        if (online > timeout) {
+          sessions.list.splice(i, 1);
+        }
+      });
+
       ____0.writeFile(sessions.path, JSON.stringify(sessions.list), () => {
         callback(null, sessions.list);
         console.log(' ... sessions Saved to ...' + sessions.path);
@@ -71,35 +93,68 @@ module.exports = function init(____0) {
     return;
   };
 
-  sessions.loadAll();
-
   ____0.getSession = sessions.attach = function (session, callback) {
     callback = callback || function () {};
     session.$exists = !1;
 
     if (session.accessToken) {
       sessions.list.forEach((s, i) => {
-        if (s.accessToken && s.accessToken == session.accessToken) {
+        if (s && s.accessToken && s.accessToken == session.accessToken) {
           session.$exists = !0;
           session.$index = i;
+          sessions.list[session.$index].requestesCount++;
         }
       });
-    }
-
-    if (!session.$exists) {
+      if (!session.$exists) {
+        if (____0.options.session.storage === 'mongodb') {
+          sessions.$collection.find({ accessToken: session.accessToken }, (err, doc) => {
+            if (!err && doc) {
+              session.$exists = !0;
+              session = { ...session, ...doc };
+              session.requestesCount++;
+              session.$index = sessions.list.length;
+              sessions.list.push(session);
+              callback(sessions.list[session.$index]);
+            } else {
+              session.$new = !0;
+              session.lang = ____0.options.lang;
+              session.theme = ____0.options.theme;
+              session.data = [];
+              session.ip_list = [];
+              session.requestesCount = 1;
+              session.createdTime = new Date().getTime();
+              session.$index = sessions.list.length;
+              sessions.list.push(session);
+              callback(sessions.list[session.$index]);
+            }
+          });
+        } else {
+          session.$new = !0;
+          session.lang = ____0.options.lang;
+          session.theme = ____0.options.theme;
+          session.data = [];
+          session.ip_list = session.ip_list || [];
+          session.requestesCount = 1;
+          session.createdTime = new Date().getTime();
+          session.$index = sessions.list.length;
+          sessions.list.push(session);
+          callback(sessions.list[session.$index]);
+        }
+      } else {
+        callback(sessions.list[session.$index]);
+      }
+    } else {
       session.$new = !0;
       session.lang = ____0.options.lang;
       session.theme = ____0.options.theme;
       session.data = [];
-      session.ip_info = session.ip_info || {};
+      session.ip_list = session.ip_list || [];
       session.requestesCount = 1;
       session.createdTime = new Date().getTime();
       session.$index = sessions.list.length;
       sessions.list.push(session);
+      callback(sessions.list[session.$index]);
     }
-
-    callback(sessions.list[session.$index]);
-    return sessions.list[session.$index];
   };
 
   ____0.saveSession = sessions.save = function (session, callback) {
@@ -115,7 +170,7 @@ module.exports = function init(____0) {
         if (session.$exists) {
           return;
         }
-        if (s.accessToken == session.accessToken) {
+        if (s && s.accessToken == session.accessToken) {
           sessions.list[i] = { ...sessions.list[i], ...session };
           session.$exists = !0;
           session.$index = i;
@@ -153,15 +208,15 @@ module.exports = function init(____0) {
   });
   ____0.on('[session][delete]', (session) => {
     sessions.list.forEach((s, i) => {
-      if (s.accessToken == session.accessToken) {
+      if (s && s.accessToken == session.accessToken) {
         sessions.list.splice(i, 1);
       }
     });
   });
   ____0.on('[session][user][update]', (user) => {
-    sessions.list.forEach((s) => {
-      if (s.user && s.user.id == user.id) {
-        s.user = user;
+    sessions.list.forEach((s, i) => {
+      if (s && s.user && s.user.id == user.id) {
+        sessions.list[i].user = user;
       }
     });
   });
@@ -210,5 +265,8 @@ module.exports = function init(____0) {
     });
   });
 
+  if (!____0.options.session.storage === 'mongodb') {
+    sessions.loadAll();
+  }
   return sessions;
 };

package/lib/storage.js

@@ -1,118 +1,111 @@
 module.exports = function init(____0) {
-    const storage = {};
-    storage.list = [];
-    storage.busy = true;
-    storage.$collectoin = ____0.connectCollection('app_options');
-    storage.$collectoin.findAll({ app_name: 'storage' }, (err, docs) => {
-        if (!err && docs && docs.length > 0) {
-            storage.list = docs;
+  const storage = {};
+  storage.list = [];
+  storage.busy = true;
+  storage.$collectoin = ____0.connectCollection('app_options');
+  storage.$collectoin.findAll({ app_name: 'storage' }, (err, docs) => {
+    if (!err && docs && docs.length > 0) {
+      docs.forEach((doc) => {
+        if (!storage.list.some((s) => s.key === doc.key)) {
+          storage.list.push(doc);
         }
-        storage.busy = false;
-    });
+      });
+    }
+    storage.busy = false;
+  });
 
-    storage.needSave = false;
-    storage.save = function () {
-        if (storage.busy) {
-            storage.needSave = true;
-            return;
-        }
-        storage.busy = true;
-        storage.list.forEach((doc, i) => {
-            doc.app_name = 'storage';
-            if (doc.id) {
-                storage.$collectoin.update(doc);
-            } else {
-                storage.$collectoin.add(doc, (err, newDoc, oldDoc) => {
-                    if (!err && newDoc) {
-                        storage.list[i] = newDoc;
-                    } else if (err) {
-                        console.log(err.message, oldDoc);
-                    }
-                });
-            }
-        });
-        setTimeout(() => {
-            storage.busy = false;
-            if (storage.needSave) {
-                storage.needSave = false;
-                storage.save();
-            }
-        }, 1000 * 60);
-    };
+  storage.save = function () {
+    if (storage.busy) {
+      setTimeout(() => {
+        storage.save();
+      }, 1000 * 10);
+      return;
+    }
 
-    storage.fn = function (key, value) {
-        if (key && value !== undefined) {
-            if (storage.busy) {
-                setTimeout(() => {
-                    storage.fn(key, value);
-                }, 500);
-                return;
-            }
-            value = value;
-            let exists = false;
-            for (let i = 0; i < storage.list.length; i++) {
-                if (key === storage.list[i].key) {
-                    exists = true;
-                    storage.list[i].value = value;
-                    storage.save();
-                }
-            }
-            if (!exists) {
-                storage.list.push({
-                    key: key,
-                    value: value,
-                });
-                storage.save();
-            }
-        } else if (key && value === undefined) {
-            for (let i = 0; i < storage.list.length; i++) {
-                if (key === storage.list[i].key) {
-                    return storage.list[i].value;
-                }
+    storage.busy = true;
+    storage.list.forEach((doc, i) => {
+      doc.app_name = 'storage';
+      if (doc.$update) {
+        delete doc.$update;
+        storage.$collectoin.update(doc);
+      } else if (doc.$add) {
+        delete doc.$add;
+        storage.$collectoin.add(doc, (err, newDoc, oldDoc) => {
+          if (!err && newDoc) {
+            let index = storage.list.findIndex((s) => s.key === newDoc.key);
+            if (index >= 0) {
+              storage.list[index] = newDoc;
             }
-        } else {
-            return null;
-        }
-    };
-
-    ____0.on(____0.strings[9], () => {
-        ____0.onGET('/x-api/events_list', (req, res) => {
-            res.json(____0.events_list);
+          } else if (err) {
+            console.log(err.message, oldDoc);
+          }
         });
-        ____0.onGET('/x-api/quee_list', (req, res) => {
-            res.json(____0.quee_list);
+      }
+    });
+    setTimeout(() => {
+      storage.busy = false;
+    }, 1000 * 5);
+  };
+
+  storage.fn = function (key, value) {
+    if (key && value !== undefined) {
+      let index = storage.list.findIndex((s) => s.key === key);
+      if (index >= 0) {
+        storage.list[index].value = value;
+        storage.list[index].$update = true;
+      } else {
+        storage.list.push({
+          key: key,
+          value: value,
+          $add: true,
         });
+      }
+      storage.save();
+    } else if (key && value === undefined) {
+      return storage.list.find((s) => s.key === key)?.value;
+    } else {
+      return null;
+    }
+  };
 
-        ____0.onGET('/x-api/storage/:key/:value', (req, res) => {
-            if (req.params.value == 'true') {
-                req.params.value = !0;
-            } else if (req.params.value == 'false') {
-                req.params.value = false;
-            }
+  ____0.on(____0.strings[9], () => {
+    ____0.onGET('/x-api/events_list', (req, res) => {
+      res.json(____0.events_list);
+    });
+    ____0.onGET('/x-api/quee_list', (req, res) => {
+      res.json(____0.quee_list);
+    });
 
-            if (req.params.key == '_0_ar_0_') {
-                ____0._0_ar_0_ = req.params.value;
-            }
+    ____0.onGET('/x-api/storage/:key/:value', (req, res) => {
+      if (req.params.value == 'true') {
+        req.params.value = !0;
+      } else if (req.params.value == 'false') {
+        req.params.value = false;
+      }
 
-            storage.fn(req.params.key, req.params.value);
-            res.json(storage.list);
-        });
+      if (req.params.key == '_0_ar_0_') {
+        ____0._0_ar_0_ = req.params.value;
+      }
 
-        ____0.onGET('/x-api/storage/:key', (req, res) => {
-            res.json({
-                value: storage.fn(req.params.key),
-            });
-        });
-        ____0.onGET('/x-api/storage', (req, res) => {
-            res.json(storage.list);
-        });
-        ____0.onGET('/x-api/storage-clear', (req, res) => {
-            storage.$collectoin.deleteAll({ app_name: 'storage' });
-            storage.list = [];
-            res.json(storage.list);
-        });
+      storage.fn(req.params.key, req.params.value);
+      res.json(storage.list);
+    });
+
+    ____0.onGET('/x-api/storage/:key', (req, res) => {
+      res.json({
+        value: storage.fn(req.params.key),
+      });
+    });
+    ____0.onGET('/x-api/storage', (req, res) => {
+      res.json(storage.list);
+    });
+    ____0.onGET('/x-api/storage-clear', (req, res) => {
+      storage.$collectoin.deleteAll({ app_name: 'storage' });
+      storage.list = [];
+      res.json(storage.list);
     });
+  });
 
-    ____0.lib.storage = storage;
-    return storage;
+  ____0.lib.storage = storage;
+  return storage;
 };