@kuriousdesign/machine-sdk 1.0.91 → 1.0.102

package/.github/workflows/publish.yml

@@ -1,3 +1,4 @@
+# .github/workflows/publish.yml
 name: Publish Package
 
 on:
@@ -6,7 +7,6 @@ on:
       - master
 
 permissions:
-  id-token: write  # Required for OIDC
   contents: read
 
 jobs:
@@ -20,9 +20,10 @@ jobs:
           node-version: '22'
           registry-url: 'https://registry.npmjs.org'
 
-      # Ensure npm 11.5.1 or later is installed
-      - name: Update npm
-        run: npm install -g npm@latest
       - run: npm ci
       - run: npm run build --if-present
-      - run: npm publish
+
+      - name: Publish
+        run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/dist/custom-types/Bridge.d.ts

@@ -6,3 +6,9 @@ export declare enum BridgeCmds {
 export interface BridgeData {
     connectedClients: number[];
 }
+export interface KioskControlData {
+    controlMode?: string;
+    isControlled?: boolean;
+    allowedKioskIds?: string[];
+}
+export declare const initialKioskControlData: KioskControlData;

package/dist/custom-types/Bridge.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BridgeCmds = void 0;
+exports.initialKioskControlData = exports.BridgeCmds = void 0;
 var BridgeCmds;
 (function (BridgeCmds) {
     BridgeCmds[BridgeCmds["NONE"] = 1] = "NONE";
     BridgeCmds[BridgeCmds["CONNECT"] = 2] = "CONNECT";
     BridgeCmds[BridgeCmds["DISCONNECT"] = 3] = "DISCONNECT";
 })(BridgeCmds || (exports.BridgeCmds = BridgeCmds = {}));
+exports.initialKioskControlData = {
+    controlMode: "kiosk",
+    isControlled: false,
+    allowedKioskIds: [],
+};

package/dist/custom-types/Machine.d.ts

@@ -25,6 +25,22 @@ export interface MachineCfg {
     ethernetAdapterList: number[];
 }
 export declare const initialMachineCfg: MachineCfg;
+export interface SettingsExpert {
+    overridesEnabled: boolean;
+    autoLogoutTime: number;
+    expertStaysLoggedIn: boolean;
+    dryCycle: boolean;
+}
+export declare const initialSettingsExpert: SettingsExpert;
+export interface SettingsAllUsers {
+    placeholderBool: boolean;
+}
+export declare const initialSettingsAllUsers: SettingsAllUsers;
+export interface Settings {
+    allUsers: SettingsAllUsers;
+    expert: SettingsExpert;
+}
+export declare const initialSettings: Settings;
 export interface Machine {
     estopCircuit_OK: boolean;
     estopCircuitDelayed_OK: boolean;
@@ -49,6 +65,7 @@ export interface Machine {
     currentTimeMs: number;
     activeUserId: number;
     activeRecipe: RecipeData;
+    settings: Settings;
 }
 export interface LogRecordData {
     list: DebugLogData[];

package/dist/custom-types/Machine.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initialMachine = exports.initialLogRecordData = exports.initialMachineCfg = exports.initialSystemFaultData = exports.initialFaultCodeData = void 0;
+exports.initialMachine = exports.initialLogRecordData = exports.initialSettings = exports.initialSettingsAllUsers = exports.initialSettingsExpert = exports.initialMachineCfg = exports.initialSystemFaultData = exports.initialFaultCodeData = void 0;
 const _1 = require(".");
 const Part_1 = require("./Part");
 const GlobalConstants_1 = require("./GlobalConstants");
@@ -21,6 +21,21 @@ exports.initialMachineCfg = {
     apiOpcuaDeviceId: -1,
     ethernetAdapterList: [],
 };
+exports.initialSettingsExpert = {
+    overridesEnabled: false,
+    autoLogoutTime: 15, // default to 15 minutes
+    //skipDeburrBottom: false,
+    //skipDeburrTop: false,
+    expertStaysLoggedIn: false,
+    dryCycle: false,
+};
+exports.initialSettingsAllUsers = {
+    placeholderBool: false,
+};
+exports.initialSettings = {
+    allUsers: { ...exports.initialSettingsAllUsers },
+    expert: { ...exports.initialSettingsExpert },
+};
 exports.initialLogRecordData = {
     list: Array(GlobalConstants_1.GCs.NUM_ENTRIES_MACHINE_LOG).fill(null).map(() => ({ ..._1.initialDebugLogData })),
     lastIndex: 0,
@@ -50,4 +65,5 @@ exports.initialMachine = ({
     currentTimeMs: 0,
     activeUserId: 0,
     activeRecipe: { ..._1.initialRecipe },
+    settings: { ...exports.initialSettings },
 });

package/dist/enums/DeviceId.d.ts

@@ -1,11 +1,11 @@
 export declare enum DeviceId {
-    NONE = 0,
+    NONE = 0,// Represents no device selected or invalid state
     SYS = 1,
     HMI = 2,
     SFTY = 3,
     CON = 4,
     DIAG = 5,
-    RC = 6,
+    UDP = 6,//Robot Controller
     ROB = 10,
     ABB = 11,
     EOAT = 12,

package/dist/enums/DeviceId.js

@@ -10,7 +10,8 @@ var DeviceId;
     DeviceId[DeviceId["SFTY"] = 3] = "SFTY";
     DeviceId[DeviceId["CON"] = 4] = "CON";
     DeviceId[DeviceId["DIAG"] = 5] = "DIAG";
-    DeviceId[DeviceId["RC"] = 6] = "RC";
+    DeviceId[DeviceId["UDP"] = 6] = "UDP";
+    // 0 - 9 ARE RESERVED FOR SYSTEM LEVEL STUFF
     DeviceId[DeviceId["ROB"] = 10] = "ROB";
     DeviceId[DeviceId["ABB"] = 11] = "ABB";
     DeviceId[DeviceId["EOAT"] = 12] = "EOAT";
@@ -64,7 +65,7 @@ function deviceIdToString(deviceId) {
         case DeviceId.SFTY: return "SFTY";
         case DeviceId.CON: return "CON";
         case DeviceId.DIAG: return "DIAG";
-        case DeviceId.RC: return "RC";
+        case DeviceId.UDP: return "UDP";
         case DeviceId.ROB: return "ROB";
         case DeviceId.ABB: return "ABB";
         case DeviceId.EOAT: return "EOAT";

package/dist/plc-tags/index.d.ts

@@ -25,6 +25,7 @@ export declare const MachineTags: {
     ethercatMaster_OK: string;
     ethercatSlaves_OK: string;
     currentTimeMs: string;
+    settings: string;
 };
 export declare const DeviceTags: {
     Cfg: string;

package/dist/plc-tags/index.js

@@ -45,6 +45,7 @@ exports.MachineTags = {
     ethercatMaster_OK: 'EthercatMaster_OK',
     ethercatSlaves_OK: 'EthercatSlaves_OK',
     currentTimeMs: 'CurrentTimeMs',
+    settings: 'Settings',
 };
 exports.DeviceTags = {
     Cfg: 'Cfg',

package/dist/plc-tags/mqtt.d.ts

@@ -5,6 +5,7 @@ export interface TopicData {
 export declare const MqttTopics: {
     readonly BRIDGE_STATUS: "bridge/status";
     readonly BRIDGE_CMD: "bridge/cmd";
+    readonly KIOSK_CONTROL: "bridge/control";
     readonly DEVICE_MAP: "deviceMap";
     readonly HMI_ACTION_REQ: "hmi/action_req";
     readonly EXT_SERVICE: "ext_service";

package/dist/plc-tags/mqtt.js

@@ -4,6 +4,7 @@ exports.MqttTopics = void 0;
 exports.MqttTopics = {
     BRIDGE_STATUS: 'bridge/status',
     BRIDGE_CMD: 'bridge/cmd',
+    KIOSK_CONTROL: 'bridge/control',
     DEVICE_MAP: 'deviceMap',
     HMI_ACTION_REQ: 'hmi/action_req',
     EXT_SERVICE: 'ext_service',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kuriousdesign/machine-sdk",
-  "version": "1.0.91",
+  "version": "1.0.102",
   "description": "Shared data types and helpers for machine-related repositories",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/custom-types/Bridge.ts

@@ -6,4 +6,16 @@ export enum BridgeCmds {
 
 export interface BridgeData {
     connectedClients: number[];
-}
+}
+
+export interface KioskControlData {
+    controlMode?: string;
+    isControlled?: boolean;
+    allowedKioskIds?: string[];
+}
+
+export const initialKioskControlData: KioskControlData = {
+    controlMode: "kiosk",
+    isControlled: false,
+    allowedKioskIds: [],
+};

package/src/custom-types/Machine.ts

@@ -68,6 +68,45 @@ export const initialMachineCfg: MachineCfg = {
   ethernetAdapterList: [],
 };
 
+
+
+export interface SettingsExpert {
+  overridesEnabled: boolean;
+  autoLogoutTime: number; // expert user will be automatically logged-out after this time
+  //skipDeburrBottom: boolean; // skip deburr bottom
+  //skipDeburrTop: boolean; // skip deburr top
+  expertStaysLoggedIn: boolean;
+  dryCycle: boolean; // when true, this will run the machine through the cycle without dispensing or curing to allow for testing and setup
+}
+
+export const initialSettingsExpert: SettingsExpert = {
+  overridesEnabled: false,
+  autoLogoutTime: 15, // default to 15 minutes
+  //skipDeburrBottom: false,
+  //skipDeburrTop: false,
+  expertStaysLoggedIn: false,
+  dryCycle: false,
+};
+
+
+
+export interface SettingsAllUsers {
+  placeholderBool: boolean;
+}
+export const initialSettingsAllUsers: SettingsAllUsers = {
+  placeholderBool: false,
+};
+
+export interface Settings {
+  allUsers: SettingsAllUsers;
+  expert: SettingsExpert;
+}
+
+export const initialSettings: Settings = {
+  allUsers: { ...initialSettingsAllUsers },
+  expert: { ...initialSettingsExpert },
+};
+
 export interface Machine {
     estopCircuit_OK: boolean;
     estopCircuitDelayed_OK: boolean;
@@ -93,6 +132,7 @@ export interface Machine {
     currentTimeMs: number;
     activeUserId: number;
     activeRecipe: RecipeData;
+    settings: Settings;
 }
 
 // TYPE LogRecordData :
@@ -137,4 +177,5 @@ export const initialMachine: Machine = ({
   currentTimeMs: 0,
   activeUserId: 0,
   activeRecipe: { ...initialRecipe},
+  settings: { ...initialSettings },
 });

package/src/enums/DeviceId.ts

@@ -1,24 +1,25 @@
 export enum DeviceId {
-  NONE = 0,
-  SYS = 1,
-  HMI = 2,
-  SFTY = 3,
-  CON = 4,
-  DIAG = 5,
-  RC = 6,
-  
-  ROB = 10,
-  ABB = 11,
-  EOAT = 12,
-  VIS = 13,
-  FIX_T = 14,
-  FIX_S = 15,
-  CLAMP_T = 16,
-  CLAMP_S = 17,
-  FLSB_T = 18,
-  FLSB_S = 19,
-  POT = 20,
-  SQUEE = 21,
+    NONE = 0,       // Represents no device selected or invalid state
+    SYS = 1,
+    HMI = 2,
+    SFTY = 3,
+    CON = 4,
+	DIAG = 5,
+	UDP = 6, //Robot Controller
+	// 0 - 9 ARE RESERVED FOR SYSTEM LEVEL STUFF
+	
+	ROB = 10,
+	ABB = 11,
+	EOAT = 12,
+	VIS = 13,
+	FIX_T = 14,
+	FIX_S = 15,
+	CLAMP_T = 16,
+	CLAMP_S = 17,
+	FLSB_T = 18,
+	FLSB_S = 19,
+	POT = 20,
+	SQUEE = 21,
 	GRIP = 22,
 	WEIGH = 23,
 
@@ -66,7 +67,7 @@ export function deviceIdToString(deviceId: DeviceId | number): string {
     case DeviceId.SFTY: return "SFTY";
     case DeviceId.CON: return "CON";
     case DeviceId.DIAG: return "DIAG";
-    case DeviceId.RC: return "RC";
+    case DeviceId.UDP: return "UDP";
     case DeviceId.ROB: return "ROB";
     case DeviceId.ABB: return "ABB";
     case DeviceId.EOAT: return "EOAT";

package/src/plc-tags/index.ts

@@ -30,6 +30,7 @@ export const MachineTags = {
 	ethercatMaster_OK: 'EthercatMaster_OK',
 	ethercatSlaves_OK: 'EthercatSlaves_OK',
     currentTimeMs: 'CurrentTimeMs',
+    settings: 'Settings',
 }
 
 export const DeviceTags = {

package/src/plc-tags/mqtt.ts

@@ -6,6 +6,7 @@ export interface TopicData {
 export const MqttTopics = {
     BRIDGE_STATUS: 'bridge/status',
     BRIDGE_CMD: 'bridge/cmd',
+    KIOSK_CONTROL: 'bridge/control',
     DEVICE_MAP: 'deviceMap',
     HMI_ACTION_REQ: 'hmi/action_req',
     EXT_SERVICE: 'ext_service',