mostly graceful resuming of missed _notifications (when dmt-proc is offline) with deduplication

Author: davidhq

.version

@@ -1 +1 @@
-1.2.222 · 2025-01-20
+1.2.235 · 2025-02-18

core/node/aspect-extend/user-engine-load/index.js

@@ -13,7 +13,12 @@ async function init(program) {
   function userEngineReady(results) {
     deviceLoader(program, userEnginePath);
 
-    program.loadDirectoryRecursive(path.join(userEnginePath, '_notifications'));
+    const notificationsDir = path.join(userEnginePath, '_notifications');
+
+    if (fs.existsSync(notificationsDir)) {
+      log.green(`Loading dmt notifications from ${colors.cyan(notificationsDir)}`);
+    }
+    program.loadDirectoryRecursive(notificationsDir);
 
     let notificationsReloadTimeout;
     let notificationsReloadTimeout2;
@@ -30,7 +35,7 @@ async function init(program) {
       notificationsReloadTimeout = setTimeout(() => {
         program.decommissionNotifiers();
         notificationsReloadTimeout2 = setTimeout(() => {
-          program.loadDirectoryRecursive(path.join(userEnginePath, '_notifications'));
+          program.loadDirectoryRecursive(notificationsDir);
         }, DIFF);
       }, Math.max(delay - DIFF, 0));
     });

core/node/common/lib/logger.js

@@ -200,7 +200,6 @@ class Logger {
       if (this.buffer.length > 0) {
         const prev = this.buffer[this.buffer.length - 1];
         const diff = meta.timestamp - prev.meta.timestamp;
-
         diffStr = ` (+${formatMilliseconds(diff)})`;
 
         if (diff > 1000) {

core/node/common/lib/timeutils/index.js

@@ -15,6 +15,8 @@ export const ONE_MINUTE = 60 * ONE_SECOND;
 export const ONE_HOUR = 60 * ONE_MINUTE;
 export const ONE_DAY = 24 * ONE_HOUR;
 export const ONE_WEEK = 7 * ONE_DAY;
+export const ONE_MONTH = 30 * ONE_DAY;
+export const ONE_YEAR = 365 * ONE_DAY;
 
 export function formatSeconds(seconds) {
   return formatMilliseconds(1000 * seconds);

core/node/common/lib/timeutils/prettyTime/index.js

@@ -1,23 +1,24 @@
 import { dateFns } from '../../dmtHelper.js';
 
-const { formatDistanceToNow } = dateFns;
-
-export function prettyTimeAgo(referenceDate, { detailed = false } = {}) {
-  const diff = Math.round((Date.now() - referenceDate) / 1000);
+const { formatDistance } = dateFns;
+export function prettyTimeAgo(referenceDate, { now = Date.now(), detailed = false, lang = undefined } = {}) {
+  const diff = Math.round((now - referenceDate) / 1000);
 
   if (detailed && diff < 60) {
     return `${diff}s ago`;
   }
 
-  return formatDistanceToNow(referenceDate, { addSuffix: true })
+  const str = formatDistance(referenceDate, now, { addSuffix: true })
     .replace('about ', '')
     .replace('less than a minute ', 'a few seconds ')
     .replace(/^1 day ago$/, 'yesterday')
     .trim();
+
+  return str;
 }
 
-export function prettyTime(ms) {
-  return prettyTimeAgo(ms)
+export function prettyTime(ms, { now = Date.now() } = {}) {
+  return prettyTimeAgo(ms, { now })
     .replace(' ago', '')
     .replace('yesterday', '1 day');
 }

core/node/connectome/node_modules/bufferutil/build/node_gyp_bins/python3

@@ -378,15 +378,9 @@ class Slot {
 
   get(key) {
     const slotState = this.parent.get(this.name) || {};
-    const val = key ? slotState[key] : slotState;
-
-    // if (typeof val == 'object') {
-    //   console.log(val);
-    //   //log.cyan(val);
-    // }
-
-    return typeof val == 'object' ? clone(val) : val;
-    //return key ? slotState[key] : slotState;
+    //const val = key ? slotState[key] : slotState;
+    //return typeof val == 'object' ? clone(val) : val;
+    return key ? slotState[key] : slotState;
   }
 
   set(state, { announce = true } = {}) {

core/node/connectome/node_modules/utf-8-validate/build/node_gyp_bins/python3

@@ -364,15 +364,9 @@ class Slot {
 
   get(key) {
     const slotState = this.parent.get(this.name) || {};
-    const val = key ? slotState[key] : slotState;
-
-    // if (typeof val == 'object') {
-    //   console.log(val);
-    //   //log.cyan(val);
-    // }
-
-    return typeof val == 'object' ? clone(val) : val;
-    //return key ? slotState[key] : slotState;
+    //const val = key ? slotState[key] : slotState;
+    //return typeof val == 'object' ? clone(val) : val;
+    return key ? slotState[key] : slotState;
   }
 
   set(state, { announce = true } = {}) {

core/node/connectome/stores/node/index.js

@@ -39,6 +39,7 @@ mids.push({ gui: { condition: deviceDef => deviceDef.try('service[gui].disable')
 mids.push('nearby/lanbus');
 mids.push('nearby/nearby');
 mids.push('iot');
+mids.push('notify');
 
 mids.push('content/samba');