cyberia 3.2.5 → 3.2.9

package/src/client/components/cryptokoyn/LogInCryptokoyn.js

@@ -2,13 +2,15 @@ import { Auth } from '../core/Auth.js';
 import { LogIn } from '../core/LogIn.js';
 import { AppStoreCryptokoyn } from './AppStoreCryptokoyn.js';
 
-const LogInCryptokoyn = async function () {
-  LogIn.Event['LogInCryptokoyn'] = async (options) => {
+class LogInCryptokoyn {
+  static async instance() {
+  LogIn.onLogin(async (options) => {
     const { token, user } = options;
     AppStoreCryptokoyn.Data.user.main.model.user = user;
-  };
+  }, { key: 'LogInCryptokoyn' });
   const { user } = await Auth.sessionIn();
   AppStoreCryptokoyn.Data.user.main.model.user = user;
-};
+  }
+}
 
 export { LogInCryptokoyn };

package/src/client/components/cryptokoyn/LogOutCryptokoyn.js

@@ -1,10 +1,12 @@
 import { LogOut } from '../core/LogOut.js';
 import { AppStoreCryptokoyn } from './AppStoreCryptokoyn.js';
 
-const LogOutCryptokoyn = async function () {
-  LogOut.Event['LogOutCryptokoyn'] = async (result = { user: { _id: '' } }) => {
+class LogOutCryptokoyn {
+  static async instance() {
+  LogOut.onLogout(async (result = { user: { _id: '' } }) => {
     AppStoreCryptokoyn.Data.user.main.model.user = result.user;
-  };
-};
+  }, { key: 'LogOutCryptokoyn' });
+  }
+}
 
 export { LogOutCryptokoyn };

package/src/client/components/cryptokoyn/RouterCryptokoyn.js

@@ -0,0 +1,37 @@
+import { loggerFactory } from '../core/Logger.js';
+import { Modal } from '../core/Modal.js';
+import { s } from '../core/VanillaJs.js';
+
+const logger = loggerFactory(import.meta);
+
+const BannerAppTemplate = html`Cryptokoyn`;
+
+class RouterCryptokoyn {
+  static routes() {
+    return {
+      '/': {
+        title: 'Home',
+        render: () => Modal.onHomeRouterEvent(),
+      },
+      '/log-in': { title: 'log-in', render: () => s(`.main-btn-log-in`).click() },
+      '/sign-up': { title: 'sign-up', render: () => s(`.main-btn-sign-up`).click() },
+      '/log-out': {
+        title: 'log-out',
+        render: () => s(`.main-btn-log-out`).click(),
+      },
+      '/account': {
+        title: 'account',
+        render: () => s(`.main-btn-account`).click(),
+      },
+      '/wallet': { title: 'wallet', render: () => s(`.main-btn-wallet`).click() },
+      '/settings': { title: 'settings', render: () => s(`.main-btn-settings`).click() },
+      '/recover': { title: 'recover', render: () => s(`.main-btn-recover`).click() },
+    };
+  }
+
+  static instance() {
+    return { Routes: RouterCryptokoyn.routes };
+  }
+}
+
+export { RouterCryptokoyn, BannerAppTemplate };

package/src/client/components/cryptokoyn/SettingsCryptokoyn.js

@@ -3,14 +3,14 @@ import { FullScreen } from '../core/FullScreen.js';
 import { Translate } from '../core/Translate.js';
 import { Worker } from '../core/Worker.js';
 
-const SettingsCryptokoyn = {
-  Render: async function () {
+class SettingsCryptokoyn {
+  static async instance() {
     let render = await FullScreen.RenderSetting();
     render += await Css.RenderSetting();
     render += await Translate.RenderSetting();
     render += await Worker.RenderSetting();
     return render;
-  },
-};
+  }
+}
 
 export { SettingsCryptokoyn };

package/src/client/components/cryptokoyn/SignUpCryptokoyn.js

@@ -1,9 +1,11 @@
 import { SignUp } from '../core/SignUp.js';
 
-const SignUpCryptokoyn = function () {
-  SignUp.Event['SignUpCryptokoyn'] = async (options) => {
+class SignUpCryptokoyn {
+  static instance() {
+  SignUp.onSignup(async (options) => {
     const { user } = options;
-  };
-};
+  }, { key: 'SignUpCryptokoyn' });
+  }
+}
 
 export { SignUpCryptokoyn };

package/src/client/components/cyberia/InstanceEngineCyberia.js

@@ -11,12 +11,63 @@ import { CyberiaMapService } from '../../services/cyberia-map/cyberia-map.servic
 import { FileService } from '../../services/file/file.service.js';
 import { DefaultManagement } from '../../services/default/default.management.js';
 import { getApiBaseUrl } from '../../services/core/core.service.js';
+import { ObjectLayerService } from '../../services/object-layer/object-layer.service.js';
+
+const dropdownValueKey = (value = '') => String(value).trim().replaceAll(' ', '-');
+const createDropdownOption = (value, onClick = () => {}, display = value, data = value) => ({
+  value,
+  display,
+  data,
+  onClick,
+});
 
 class InstanceEngineCyberia {
   static currentInstanceId = null;
   static currentThumbnailId = null;
   static thumbnailDirty = false;
   static portals = [];
+  static itemIdsDropdownId = 'instance-engine-item-ids-dropdown';
+
+  static syncItemIdsDropdownSelection(itemIds = []) {
+    const dropdownId = InstanceEngineCyberia.itemIdsDropdownId;
+    if (!DropDown.Tokens[dropdownId]) return;
+
+    DropDown.Tokens[dropdownId].value = [];
+    if (s(`.${dropdownId}`)) s(`.${dropdownId}`).value = [];
+    DropDown.Tokens[dropdownId].oncheckvalues = {};
+    htmls(`.dropdown-current-${dropdownId}`, '');
+    htmls(`.${dropdownId}-render-container`, '');
+
+    for (const itemId of itemIds) {
+      const key = dropdownValueKey(itemId);
+      DropDown.Tokens[dropdownId].oncheckvalues[key] = {
+        data: itemId,
+        display: itemId,
+        value: itemId,
+      };
+    }
+    DropDown.Tokens[dropdownId].value = [...itemIds];
+    if (s(`.${dropdownId}`)) s(`.${dropdownId}`).value = [...itemIds];
+    DropDown.Tokens[dropdownId]._renderSelectedBadges?.();
+  }
+
+  static async buildItemIdsDropdown() {
+    return await DropDown.instance({
+      id: InstanceEngineCyberia.itemIdsDropdownId,
+      label: html`Object Layer Item IDs`,
+      data: [],
+      type: 'checkbox',
+      containerClass: 'inl',
+      excludeSelected: true,
+      serviceProvider: async (q) => {
+        const result = await ObjectLayerService.searchItemIds({ q });
+        if (result.status === 'success' && result.data?.itemIds) {
+          return result.data.itemIds.map((itemId) => createDropdownOption(itemId));
+        }
+        return [];
+      },
+    });
+  }
 
   static renderPortalList(containerId) {
     const container = s(`.${containerId}`);
@@ -40,7 +91,12 @@ class InstanceEngineCyberia {
           (${portal.sourceCellX}, ${portal.sourceCellY})
           <span style="margin:0 4px;">&rarr;</span>
           <span style="color:${darkTheme ? '#fc8' : '#842'};">${portal.targetMapCode}</span>
-          (${portal.targetCellX}, ${portal.targetCellY})
+          ${portal.targetCellX < 0 || portal.targetCellY < 0
+            ? '<span style="color:#aaa;">(random)</span>'
+            : `(${portal.targetCellX}, ${portal.targetCellY})`}
+          <span style="color:${darkTheme ? '#9e9' : '#383'};margin-left:4px;font-size:11px;"
+            >[${portal.portalMode || 'inter-portal'}]</span
+          >
         </div>
         <div class="in fll" style="display:flex;gap:3px;">
           <button
@@ -102,6 +158,7 @@ class InstanceEngineCyberia {
     const idStatus = 'instance-engine-input-status';
     const idThumbnail = 'instance-engine-input-thumbnail';
     const idMapCodesDropdown = 'instance-engine-map-codes-dropdown';
+    const idItemIdsDropdown = InstanceEngineCyberia.itemIdsDropdownId;
     const managementId = 'modal-cyberia-instance-engine';
     const portalListId = 'instance-engine-portal-list';
     const idSourceMapCode = 'instance-engine-source-map-code';
@@ -127,6 +184,7 @@ class InstanceEngineCyberia {
       const cyberiaMapCodes = DropDown.Tokens[idMapCodesDropdown]?.value
         ? [...DropDown.Tokens[idMapCodesDropdown].value]
         : [];
+      const itemIds = DropDown.Tokens[idItemIdsDropdown]?.value ? [...DropDown.Tokens[idItemIdsDropdown].value] : [];
       const payload = {
         code: s(`.${idCode}`)?.value || '',
         name: s(`.${idName}`)?.value || '',
@@ -134,13 +192,14 @@ class InstanceEngineCyberia {
         tags,
         status: DropDown.Tokens[idStatus]?.value || 'unlisted',
         cyberiaMapCodes,
+        itemIds,
         portals: InstanceEngineCyberia.portals,
       };
       if (InstanceEngineCyberia.currentThumbnailId) payload.thumbnail = InstanceEngineCyberia.currentThumbnailId;
       return payload;
     };
 
-    const saveInstance = async () => {
+    const persistInstance = async ({ notify = true } = {}) => {
       // Upload thumbnail file only if user selected a new one
       const thumbnailInput = s(`.${idThumbnail}`);
       if (
@@ -155,34 +214,44 @@ class InstanceEngineCyberia {
         if (uploadResult.status === 'success' && uploadResult.data && uploadResult.data.length > 0) {
           InstanceEngineCyberia.currentThumbnailId = uploadResult.data[0]._id;
         } else {
-          NotificationManager.Push({
-            html: uploadResult.message || 'Failed to upload thumbnail',
-            status: 'error',
-          });
-          return;
+          if (notify) {
+            NotificationManager.Push({
+              html: uploadResult.message || 'Failed to upload thumbnail',
+              status: 'error',
+            });
+          }
+          return uploadResult;
         }
       }
 
       const body = getInstancePayload();
+      const isUpdate = !!InstanceEngineCyberia.currentInstanceId;
       let result;
-      if (InstanceEngineCyberia.currentInstanceId) {
+      if (isUpdate) {
         result = await CyberiaInstanceService.put({ id: InstanceEngineCyberia.currentInstanceId, body });
       } else {
         result = await CyberiaInstanceService.post({ body });
       }
-      NotificationManager.Push({
-        html:
-          result.status === 'error'
-            ? result.message
-            : InstanceEngineCyberia.currentInstanceId
-              ? Translate.Render('success-update-item')
-              : Translate.Render('success-create-item'),
-        status: result.status,
-      });
+      if (notify) {
+        NotificationManager.Push({
+          html:
+            result.status === 'error'
+              ? result.message
+              : isUpdate
+                ? Translate.instance('success-update-item')
+                : Translate.instance('success-create-item'),
+          status: result.status,
+        });
+      }
       if (result.status === 'success') {
         if (result.data?._id) InstanceEngineCyberia.currentInstanceId = result.data._id;
         await DefaultManagement.loadTable(managementId, { force: true, reload: true });
       }
+      return result;
+    };
+
+    const saveInstance = async () => {
+      await persistInstance({ notify: true });
     };
 
     const loadInstance = async (instanceData) => {
@@ -265,6 +334,8 @@ class InstanceEngineCyberia {
         }
       }
 
+      InstanceEngineCyberia.syncItemIdsDropdownSelection(instanceData.itemIds || instanceData.itemsId || []);
+
       // Load portals
       InstanceEngineCyberia.portals = (instanceData.portals || []).map((p) => ({
         sourceMapCode: p.sourceMapCode || '',
@@ -273,6 +344,7 @@ class InstanceEngineCyberia {
         targetMapCode: p.targetMapCode || '',
         targetCellX: p.targetCellX || 0,
         targetCellY: p.targetCellY || 0,
+        portalMode: p.portalMode || 'inter-portal',
       }));
       InstanceEngineCyberia.renderPortalList(portalListId);
     };
@@ -303,6 +375,12 @@ class InstanceEngineCyberia {
         htmls(`.dropdown-current-${idMapCodesDropdown}`, '');
         htmls(`.${idMapCodesDropdown}-render-container`, '');
       }
+      if (DropDown.Tokens[idItemIdsDropdown]) {
+        DropDown.Tokens[idItemIdsDropdown].oncheckvalues = {};
+        DropDown.Tokens[idItemIdsDropdown].value = [];
+        htmls(`.dropdown-current-${idItemIdsDropdown}`, '');
+        htmls(`.${idItemIdsDropdown}-render-container`, '');
+      }
       InstanceEngineCyberia.portals = [];
       InstanceEngineCyberia.renderPortalList(portalListId);
     };
@@ -325,16 +403,17 @@ class InstanceEngineCyberia {
       // Portal management
       if (s(`.btn-instance-engine-portal-connect`))
         s(`.btn-instance-engine-portal-connect`).onclick = async () => {
-          if (!InstanceEngineCyberia.currentInstanceId) {
-            NotificationManager.Push({
-              html: Translate.Render('save-instance-first') || 'Save the instance first.',
-              status: 'warning',
-            });
-            return;
-          }
           const btn = s(`.btn-instance-engine-portal-connect`);
           if (btn) btn.disabled = true;
           try {
+            const persistResult = await persistInstance({ notify: false });
+            if (!persistResult || persistResult.status !== 'success' || !InstanceEngineCyberia.currentInstanceId) {
+              NotificationManager.Push({
+                html: persistResult?.message || Translate.instance('save-instance-first') || 'Save the instance first.',
+                status: persistResult?.status === 'error' ? 'error' : 'warning',
+              });
+              return;
+            }
             const result = await CyberiaInstanceService.portalConnect({ id: InstanceEngineCyberia.currentInstanceId });
             if (result.status === 'error') {
               NotificationManager.Push({ html: result.message, status: 'error' });
@@ -348,21 +427,21 @@ class InstanceEngineCyberia {
               });
               return;
             }
-            // Append generated portals (skip duplicates by source+target pair)
-            const existing = new Set(InstanceEngineCyberia.portals.map((p) => `${p.sourceMapCode}>${p.targetMapCode}`));
-            let added = 0;
-            for (const p of generated) {
-              const key = `${p.sourceMapCode}>${p.targetMapCode}`;
-              if (!existing.has(key)) {
-                InstanceEngineCyberia.portals.push(p);
-                existing.add(key);
-                added++;
-              }
-            }
+            // Replace all portals with the centralized topology output
+            // (ring + random behavior for remaining unassigned portals)
+            InstanceEngineCyberia.portals = generated.map((p) => ({
+              sourceMapCode: p.sourceMapCode || '',
+              sourceCellX: p.sourceCellX || 0,
+              sourceCellY: p.sourceCellY || 0,
+              targetMapCode: p.targetMapCode || '',
+              targetCellX: p.targetCellX || 0,
+              targetCellY: p.targetCellY || 0,
+              portalMode: p.portalMode || 'inter-portal',
+            }));
             InstanceEngineCyberia.renderPortalList(portalListId);
             NotificationManager.Push({
-              html: `${topology} ring — ${added} portal(s) added.`,
-              status: added > 0 ? 'success' : 'warning',
+              html: `${topology} — ${generated.length} portal(s) generated.`,
+              status: 'success',
             });
           } catch (e) {
             NotificationManager.Push({ html: e.message, status: 'error' });
@@ -380,6 +459,7 @@ class InstanceEngineCyberia {
             targetMapCode: s(`.${idTargetMapCode}`)?.value || '',
             targetCellX: parseInt(s(`.${idTargetCellX}`)?.value) || 0,
             targetCellY: parseInt(s(`.${idTargetCellY}`)?.value) || 0,
+            portalMode: 'inter-portal',
           };
           InstanceEngineCyberia.portals.push(portal);
           InstanceEngineCyberia.renderPortalList(portalListId);
@@ -427,7 +507,7 @@ class InstanceEngineCyberia {
       { value: 'archived', display: 'archived', data: 'archived', onClick: () => {} },
     ];
 
-    const managementTableHtml = await CyberiaInstanceManagement.RenderTable({
+    const managementTableHtml = await CyberiaInstanceManagement.instance({
       idModal: managementId,
       loadInstanceCallback: loadInstance,
       appStore,
@@ -452,7 +532,7 @@ class InstanceEngineCyberia {
       ${dynamicCol({ containerSelector: 'instance-engine-container', id: dcFields, type: 'search-inputs' })}
       <div class="fl">
         <div class="in fll ${dcFields}-col-a">
-          ${await Input.Render({
+          ${await Input.instance({
             id: idCode,
             label: html`Code`,
             containerClass: 'inl',
@@ -460,7 +540,7 @@ class InstanceEngineCyberia {
           })}
         </div>
         <div class="in fll ${dcFields}-col-b">
-          ${await Input.Render({
+          ${await Input.instance({
             id: idName,
             label: html`Name`,
             containerClass: 'inl',
@@ -468,7 +548,7 @@ class InstanceEngineCyberia {
           })}
         </div>
         <div class="in fll ${dcFields}-col-c">
-          ${await Input.Render({
+          ${await Input.instance({
             id: idDescription,
             label: html`Description`,
             containerClass: 'inl',
@@ -479,7 +559,7 @@ class InstanceEngineCyberia {
       ${dynamicCol({ containerSelector: 'instance-engine-container', id: dcMetaFields, type: 'search-inputs' })}
       <div class="fl">
         <div class="in fll ${dcMetaFields}-col-a">
-          ${await Input.Render({
+          ${await Input.instance({
             id: idTags,
             label: html`Tags (comma separated)`,
             containerClass: 'inl',
@@ -487,7 +567,7 @@ class InstanceEngineCyberia {
           })}
         </div>
         <div class="in fll ${dcMetaFields}-col-b">
-          ${await DropDown.Render({
+          ${await DropDown.instance({
             id: idStatus,
             label: html`Status`,
             data: statusOptions.map((opt) => ({ ...opt })),
@@ -506,12 +586,12 @@ class InstanceEngineCyberia {
       </div>
       <div class="in section-mp" style="margin-top: 5px;">
         <div class="in instance-engine-thumbnail-preview" style="margin-bottom: 5px;"></div>
-        ${await BtnIcon.Render({
+        ${await BtnIcon.instance({
           class: 'wfa btn-instance-engine-toggle-thumbnail',
           label: html`<i class="fa-solid fa-caret-right instance-engine-thumbnail-caret"></i> Thumbnail`,
         })}
         <div class="in instance-engine-thumbnail-body hide">
-          ${await InputFile.Render(
+          ${await InputFile.instance(
             {
               id: idThumbnail,
               multiple: false,
@@ -543,7 +623,7 @@ class InstanceEngineCyberia {
         </div>
       </div>
       <div class="in section-mp" style="margin-top: 10px;">
-        ${await DropDown.Render({
+        ${await DropDown.instance({
           id: idMapCodesDropdown,
           label: html`Cyberia Map Codes`,
           data: [],
@@ -564,12 +644,13 @@ class InstanceEngineCyberia {
           },
         })}
       </div>
+      <div class="in section-mp" style="margin-top: 10px;">${await InstanceEngineCyberia.buildItemIdsDropdown()}</div>
       <div class="in section-mp" style="margin-top: 10px;">
         <div class="in input-label" style="font-size:14px;margin-bottom:5px;">Portals</div>
         ${dynamicCol({ containerSelector: 'instance-engine-container', id: dcPortalSource, type: 'search-inputs' })}
         <div class="fl">
           <div class="in fll ${dcPortalSource}-col-a">
-            ${await Input.Render({
+            ${await Input.instance({
               id: idSourceMapCode,
               label: html`Source Map Code`,
               containerClass: 'inl',
@@ -577,7 +658,7 @@ class InstanceEngineCyberia {
             })}
           </div>
           <div class="in fll ${dcPortalSource}-col-b">
-            ${await Input.Render({
+            ${await Input.instance({
               id: idSourceCellX,
               label: html`Source Cell X`,
               containerClass: 'inl',
@@ -587,7 +668,7 @@ class InstanceEngineCyberia {
             })}
           </div>
           <div class="in fll ${dcPortalSource}-col-c">
-            ${await Input.Render({
+            ${await Input.instance({
               id: idSourceCellY,
               label: html`Source Cell Y`,
               containerClass: 'inl',
@@ -600,7 +681,7 @@ class InstanceEngineCyberia {
         ${dynamicCol({ containerSelector: 'instance-engine-container', id: dcPortalTarget, type: 'search-inputs' })}
         <div class="fl">
           <div class="in fll ${dcPortalTarget}-col-a">
-            ${await Input.Render({
+            ${await Input.instance({
               id: idTargetMapCode,
               label: html`Target Map Code`,
               containerClass: 'inl',
@@ -608,7 +689,7 @@ class InstanceEngineCyberia {
             })}
           </div>
           <div class="in fll ${dcPortalTarget}-col-b">
-            ${await Input.Render({
+            ${await Input.instance({
               id: idTargetCellX,
               label: html`Target Cell X`,
               containerClass: 'inl',
@@ -618,7 +699,7 @@ class InstanceEngineCyberia {
             })}
           </div>
           <div class="in fll ${dcPortalTarget}-col-c">
-            ${await Input.Render({
+            ${await Input.instance({
               id: idTargetCellY,
               label: html`Target Cell Y`,
               containerClass: 'inl',
@@ -629,17 +710,17 @@ class InstanceEngineCyberia {
           </div>
         </div>
         <div class="in" style="display:flex;gap:5px;flex-wrap:wrap;">
-          ${await BtnIcon.Render({
+          ${await BtnIcon.instance({
             class: 'wfa btn-instance-engine-add-portal',
             label: html`<i class="fa-solid fa-plus"></i> Add Portal`,
           })}
-          ${await BtnIcon.Render({
+          ${await BtnIcon.instance({
             class: 'wfa btn-instance-engine-portal-connect',
             label: html`<i class="fa-solid fa-circle-nodes"></i> Portal Connector`,
           })}
         </div>
         <div class="in" style="margin-top: 10px;">
-          ${await BtnIcon.Render({
+          ${await BtnIcon.instance({
             class: 'wfa btn-instance-engine-toggle-portal-filter',
             label: html`<i class="fa-solid fa-caret-right instance-engine-portal-filter-caret"></i> Filters`,
           })}
@@ -647,7 +728,7 @@ class InstanceEngineCyberia {
             ${dynamicCol({ containerSelector: 'instance-engine-container', id: dcPortalFilter, type: 'a-50-b-50' })}
             <div class="fl">
               <div class="in fll ${dcPortalFilter}-col-a">
-                ${await Input.Render({
+                ${await Input.instance({
                   id: idFilterSource,
                   label: html`Source Map Code`,
                   containerClass: 'inl',
@@ -656,7 +737,7 @@ class InstanceEngineCyberia {
                 })}
               </div>
               <div class="in fll ${dcPortalFilter}-col-b">
-                ${await Input.Render({
+                ${await Input.instance({
                   id: idFilterTarget,
                   label: html`Target Map Code`,
                   containerClass: 'inl',
@@ -666,7 +747,7 @@ class InstanceEngineCyberia {
               </div>
             </div>
             <div class="in" style="margin-top:5px;">
-              ${await BtnIcon.Render({
+              ${await BtnIcon.instance({
                 class: 'wfa btn-instance-engine-clear-portal-filter',
                 label: html`<i class="fa-solid fa-broom"></i> Clear Filters`,
               })}
@@ -679,13 +760,13 @@ class InstanceEngineCyberia {
         ${dynamicCol({ containerSelector: 'instance-engine-container', id: dcSaveNew, type: 'a-50-b-50' })}
         <div class="fl">
           <div class="in fll ${dcSaveNew}-col-a" style="padding: 5px;">
-            ${await BtnIcon.Render({
+            ${await BtnIcon.instance({
               class: 'wfa btn-instance-engine-save',
               label: html`<i class="fa-solid fa-floppy-disk"></i> Save Instance`,
             })}
           </div>
           <div class="in fll ${dcSaveNew}-col-b" style="padding: 5px;">
-            ${await BtnIcon.Render({
+            ${await BtnIcon.instance({
               class: 'wfa btn-instance-engine-new',
               label: html`<i class="fa-solid fa-file"></i> New Instance`,
             })}