desktopr 1.2.1 → 1.2.2

package/dist-sdk/_constants.d.ts

@@ -2,3 +2,4 @@ export declare const APP_URL: string;
 export declare const APP_VERSION: string;
 export declare const COMAPNION_WINDOW_LABEL_PREFIX: string;
 export declare const READY_EVENT_NAME: string;
+export declare const WINDOWS_LABELS_TRACKER_VARIABLE_NAME: string;

package/dist-sdk/_constants.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.READY_EVENT_NAME = exports.COMAPNION_WINDOW_LABEL_PREFIX = exports.APP_VERSION = exports.APP_URL = void 0;
+exports.WINDOWS_LABELS_TRACKER_VARIABLE_NAME = exports.READY_EVENT_NAME = exports.COMAPNION_WINDOW_LABEL_PREFIX = exports.APP_VERSION = exports.APP_URL = void 0;
 const bridge_constants_json_1 = __importDefault(require("./bridge.constants.json"));
 exports.APP_URL = bridge_constants_json_1.default.appUrl;
 exports.APP_VERSION = bridge_constants_json_1.default.appVersion;
 exports.COMAPNION_WINDOW_LABEL_PREFIX = bridge_constants_json_1.default.companionWindowLabelPrefix;
 exports.READY_EVENT_NAME = "dtrReady";
+exports.WINDOWS_LABELS_TRACKER_VARIABLE_NAME = "open-windows-labels-tracker-rpkw6kjzxn8bfhj5u74q";

package/dist-sdk/modules/rs/window/_helpers.d.ts

@@ -8,3 +8,6 @@ export declare const newWindow: (core: {
     fullscreen?: boolean;
     url?: string;
 }) => Promise<void>;
+export declare const closeWindow: (core: {
+    invoke: DesktoprAPI["invoke"];
+}, label: string) => Promise<void>;

package/dist-sdk/modules/rs/window/_helpers.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.newWindow = exports.waitTauri = exports.tauriReadyCheck = void 0;
+exports.closeWindow = exports.newWindow = exports.waitTauri = exports.tauriReadyCheck = void 0;
+const sdk_1 = require("../../../sdk");
 const _constants_1 = require("../../../_constants");
 const utils_1 = require("suffro-lib/utils");
 const tauriReadyCheck = () => typeof window !== "undefined" &&
@@ -26,10 +27,36 @@ const newWindow = async (core, options) => {
     const randomWindowLabel = `w_${Math.random()
         .toString(36)
         .substring(2, 2 + 8)}`;
+    const labelToSet = (options?.label) ?? randomWindowLabel;
+    try {
+        const usedLabelsJSON = await sdk_1.Desktopr.globalVariables.get(_constants_1.WINDOWS_LABELS_TRACKER_VARIABLE_NAME);
+        let usedLabelsObj = await JSON.parse(usedLabelsJSON);
+        usedLabelsObj[labelToSet] = true;
+        const updatedUsedLabelsJSON = JSON.stringify(usedLabelsObj);
+        await sdk_1.Desktopr.globalVariables.set(_constants_1.WINDOWS_LABELS_TRACKER_VARIABLE_NAME, updatedUsedLabelsJSON);
+    }
+    catch (error) {
+        console.warn("Could not update used windows labels tracker");
+    }
     core.invoke("dtr_win_open", {
-        label: options?.label ?? randomWindowLabel,
-        fullscreen: options?.fullscreen || false,
-        url: options?.url ?? "",
+        label: labelToSet,
+        fullscreen: (options?.fullscreen) || false,
+        url: (options?.url) ?? "",
     });
 };
 exports.newWindow = newWindow;
+const closeWindow = async (core, label) => {
+    try {
+        const usedLabelsJSON = await sdk_1.Desktopr.globalVariables.get(_constants_1.WINDOWS_LABELS_TRACKER_VARIABLE_NAME);
+        let usedLabelsObj = await JSON.parse(usedLabelsJSON);
+        if (label)
+            delete usedLabelsObj[label];
+        const updatedUsedLabelsJSON = JSON.stringify(usedLabelsObj);
+        await sdk_1.Desktopr.globalVariables.set(_constants_1.WINDOWS_LABELS_TRACKER_VARIABLE_NAME, updatedUsedLabelsJSON);
+    }
+    catch (error) {
+        console.warn("Could not update used windows labels tracker");
+    }
+    core.invoke("dtr_win_close", { label });
+};
+exports.closeWindow = closeWindow;

package/dist-sdk/modules/rs/window/_main.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildWindow = buildWindow;
 const _helpers_1 = require("../companion/_helpers");
+const _helpers_2 = require("./_helpers");
 function buildWindow(core) {
     const randomWindowLabel = `w_${Math.random().toString(36).substring(2, 2 + 8)}`;
     return {
@@ -21,13 +22,9 @@ function buildWindow(core) {
                     openFullscreen: options?.fullscreen
                 });
             else
-                core.invoke("dtr_win_open", {
-                    label: ((options?.label) ?? randomWindowLabel),
-                    fullscreen: ((options?.fullscreen) || false),
-                    url: ((options?.url) ?? "")
-                });
+                (0, _helpers_2.newWindow)(core, options);
         },
-        close: (label) => core.invoke("dtr_win_close", { label }),
+        close: (label) => (0, _helpers_2.closeWindow)(core, label),
         getInfo: (label) => core.invoke("dtr_win_get_info", { label }),
         state: {}
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "desktopr",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Official JS/TS SDK for the Desktopr native bridge",
   "main": "dist-sdk/sdk/index.js",
   "types": "dist-sdk/sdk/index.d.ts",