@signageos/cli 1.6.4 → 1.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/.env CHANGED
@@ -1,2 +1,3 @@
1
1
  SOS_API_URL=https://api.signageos.io
2
2
  SOS_BOX_HOST=box.signageos.io
3
+ SOS_FORWARD_SERVER_URL=https://forward.signageos.io
package/README.md CHANGED
@@ -264,7 +264,8 @@ sos device connect
264
264
  | --applet-uid *(required)* | Applet UID | STDIN |
265
265
  | --organization-uid *(required)* | Organization UID | STDIN |
266
266
  | --update-package-config *(optional)* | Update package.json value `sos.appletUid` config when applet doesn't exists and is created | false |
267
- | --server-public-url *(optional)* | Public url of local machine server. Is useful when the local machine is behind a reverse proxy. | http://{CURRENT_REMOTE_ADDR}:{RANDOM_PORT} |
267
+ | --server-public-url *(optional)* | Public url of local machine server. Is useful when the local machine is behind a reverse proxy. | http://{CURRENT_REMOTE_ADDR}:{RANDOM_PORT} or https://forward.signageos.io/{random-hash} |
268
+ | --use-forward-server *(optional)* | Use forward server to connect to the device instead of the local network (LAN) (https://forward.signageos.io/{random-hash}). It's useful when the device is not in the same network as the local machine. | false |
268
269
  | --server-port *(optional)* | The custom server port for local machine server. | {RANDOM_PORT} |
269
270
  | --force *(optional)* | Force start applet server even if it is already running on a different port. Kill the running server first. | false |
270
271
 
@@ -135,9 +135,11 @@ var COMMON_SCRIPTS = {
135
135
  var WEBPACK_SCRIPTS = {
136
136
  start: 'webpack serve --mode development',
137
137
  build: 'webpack --mode production && npm run escheck',
138
- connect: 'webpack --watch',
138
+ connect: 'echo "Deprecated command \"npm run connect\". Use \"npm run watch\" instead." && npm run watch',
139
+ watch: 'webpack --watch',
139
140
  };
140
141
  var ESBUILD_SCRIPTS = {
142
+ // TODO add start and watch
141
143
  build: 'node ./esbuild.config.mjs',
142
144
  };
143
145
  exports.appletGenerate = (0, commandDefinition_1.createCommandDefinition)({
@@ -343,6 +345,7 @@ function createPackageConfig(name, version, bundler) {
343
345
  });
344
346
  }
345
347
  var createWebpackConfig = function (entryFileName, fileExtensions, imports, rules, plugins) { return "\n".concat(imports.join(';\n'), "\n\nexports = module.exports = {\n\tentry: ").concat(JSON.stringify('./src/' + entryFileName), ",\n\ttarget: ").concat(JSON.stringify(['web', 'es5']), ",\n\tinfrastructureLogging: {\n\t\tlevel: 'warn',\n\t},\n\toutput: {\n\t\tfilename: 'index.js',\n\t},\n\tresolve: {\n\t\textensions: ").concat(JSON.stringify(fileExtensions), ",\n\t},\n\tmodule: {\n\t\trules: [\n").concat(rules.join(',\n'), "\n\t\t],\n\t},\n\tplugins: [\n").concat(plugins.join(',\n'), "\n\t],\n};\n"); };
348
+ // TODO fix esbuild config because it doesn't work. @signageos/lib/dist/ESBuild/Bundler.js and @signageos/lib/dist/ESBuild/utils/stopwatch.js are not public
346
349
  var createEsbuildConfig = function () { return "\nimport { Bundler } from '@signageos/lib/dist/ESBuild/Bundler.js';\nimport { stopwatch } from '@signageos/lib/dist/ESBuild/utils/stopwatch.js';\nimport { context } from 'esbuild';\n\nconst bundler = new Bundler({\n\toutdir: './dist',\n\tparameters: {},\n\targv: process.argv,\n});\n\nawait stopwatch('Building the applet', [\n\tasync () => {\n\t\tawait stopwatch('Bundling', async () => {\n\t\t\tawait bundler.writeIndexFile('./public/index.html');\n\t\t\tconst ctx = await context({\n\t\t\t\tentryPoints: ['./src/index.ts'],\n\t\t\t\toutdir: './dist',\n\t\t\t\tplatform: 'browser',\n\t\t\t\tbundle: true,\n\t\t\t\tminify: true,\n\t\t\t});\n\t\t\tawait bundler.build(ctx);\n\t\t});\n\t\tawait stopwatch('Transpiling to ES5', [\n\t\t\tbundler.transpileToES5({\n\t\t\t\tminify: true,\n\t\t\t\tenv: {\n\t\t\t\t\ttargets: {\n\t\t\t\t\t\tchrome: '28',\n\t\t\t\t\t},\n\t\t\t\t},\n\t\t\t}),\n\t\t]);\n\t},\n]);\n"; };
347
350
  var createIndexHtml = function (title) { return "<!DOCTYPE html>\n<html lang=\"en\">\n<head>\n\t<meta charset=\"utf-8\" />\n\t<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\" />\n\t<meta name=\"theme-color\" content=\"#000000\" />\n\t<title>".concat(title, "</title>\n</head>\n<body>\n\t<h1>Hello ").concat(title, "</h1>\n\t<div id=\"root\"></div>\n</body>\n</html>\n"); };
348
351
  var createIndexTs = function () { return createIndexJs(); }; // There is currently no differences
@@ -1 +1 @@
1
- {"version":3,"file":"appletGenerateCommand.js","sourceRoot":"","sources":["../../../src/Applet/Generate/appletGenerateCommand.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"appletGenerateCommand.js","sourceRoot":"","sources":["../../../src/Applet/Generate/appletGenerateCommand.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,9 @@
1
1
  import { CommandLineOptions } from '../../Command/commandDefinition';
2
+ export declare const USE_FORWARD_SERVER_OPTION: {
3
+ readonly name: "use-forward-server";
4
+ readonly type: BooleanConstructor;
5
+ readonly description: string;
6
+ };
2
7
  declare const OPTION_LIST: readonly [{
3
8
  readonly name: "no-default-organization";
4
9
  readonly type: BooleanConstructor;
@@ -27,6 +32,10 @@ declare const OPTION_LIST: readonly [{
27
32
  readonly name: "force";
28
33
  readonly type: BooleanConstructor;
29
34
  readonly description: "Force start applet server even if it is already running on a different port. Kill the running server first.";
35
+ }, {
36
+ readonly name: "use-forward-server";
37
+ readonly type: BooleanConstructor;
38
+ readonly description: string;
30
39
  }];
31
40
  export declare const connect: {
32
41
  name: "connect";
@@ -59,6 +68,10 @@ export declare const connect: {
59
68
  readonly name: "force";
60
69
  readonly type: BooleanConstructor;
61
70
  readonly description: "Force start applet server even if it is already running on a different port. Kill the running server first.";
71
+ }, {
72
+ readonly name: "use-forward-server";
73
+ readonly type: BooleanConstructor;
74
+ readonly description: string;
62
75
  }];
63
76
  commands: never[];
64
77
  run: (options: CommandLineOptions<typeof OPTION_LIST>) => Promise<void>;
@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
36
36
  }
37
37
  };
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
- exports.connect = void 0;
39
+ exports.connect = exports.USE_FORWARD_SERVER_OPTION = void 0;
40
40
  var deviceFacade_1 = require("../deviceFacade");
41
41
  var organizationFacade_1 = require("../../Organization/organizationFacade");
42
42
  var appletFacade_1 = require("../../Applet/appletFacade");
@@ -45,6 +45,14 @@ var commandDefinition_1 = require("../../Command/commandDefinition");
45
45
  var sdk_1 = require("@signageos/sdk");
46
46
  var wait_1 = require("../../Timer/wait");
47
47
  var appletServerHelper_1 = require("../../Applet/appletServerHelper");
48
+ var debug_1 = require("debug");
49
+ var debug = (0, debug_1.default)('@signageos/cli:Device:Connect:connectCommand');
50
+ exports.USE_FORWARD_SERVER_OPTION = {
51
+ name: 'use-forward-server',
52
+ type: Boolean,
53
+ description: 'Use forward server to connect to the device instead of the local network (LAN).' +
54
+ " It's useful when the device is not in the same network as the local machine.",
55
+ };
48
56
  var OPTION_LIST = [
49
57
  organizationFacade_1.NO_DEFAULT_ORGANIZATION_OPTION,
50
58
  organizationFacade_1.ORGANIZATION_UID_OPTION,
@@ -53,6 +61,7 @@ var OPTION_LIST = [
53
61
  appletServerHelper_1.SERVER_PUBLIC_URL_OPTION,
54
62
  appletServerHelper_1.SERVER_PORT_OPTION,
55
63
  appletServerHelper_1.SERVER_FORCE_OPTION,
64
+ exports.USE_FORWARD_SERVER_OPTION,
56
65
  ];
57
66
  exports.connect = (0, commandDefinition_1.createCommandDefinition)({
58
67
  name: 'connect',
@@ -61,7 +70,7 @@ exports.connect = (0, commandDefinition_1.createCommandDefinition)({
61
70
  commands: [],
62
71
  run: function (options) {
63
72
  return __awaiter(this, void 0, void 0, function () {
64
- var currentDirectory, organizationUid, organization, restApi, dev, appletUid, appletVersion, deviceUid, appletPort, appletPublicUrl, server, connection, stopServer;
73
+ var currentDirectory, organizationUid, organization, restApi, dev, appletUid, appletVersion, deviceUid, appletPort, appletPublicUrl, useForwardServer, server, finalAppletPublicUrl, connection, stopServer;
65
74
  var _this = this;
66
75
  return __generator(this, function (_a) {
67
76
  switch (_a.label) {
@@ -90,6 +99,7 @@ exports.connect = (0, commandDefinition_1.createCommandDefinition)({
90
99
  deviceUid = _a.sent();
91
100
  appletPort = options[appletServerHelper_1.SERVER_PORT_OPTION.name];
92
101
  appletPublicUrl = options[appletServerHelper_1.SERVER_PUBLIC_URL_OPTION.name];
102
+ useForwardServer = options[exports.USE_FORWARD_SERVER_OPTION.name];
93
103
  return [4 /*yield*/, (0, appletServerHelper_1.killAppletServerIfRunningAndForceOption)(dev, options, appletUid, appletVersion, appletPort)];
94
104
  case 7:
95
105
  _a.sent();
@@ -101,10 +111,12 @@ exports.connect = (0, commandDefinition_1.createCommandDefinition)({
101
111
  })];
102
112
  case 8:
103
113
  server = _a.sent();
114
+ debug('Server is running', server);
115
+ finalAppletPublicUrl = useForwardServer ? server.publicUrl : "http://".concat(server.remoteAddr, ":").concat(server.port);
104
116
  return [4 /*yield*/, dev.deviceConnect.connect(deviceUid, {
105
117
  appletUid: appletUid,
106
118
  appletVersion: appletVersion,
107
- appletPublicUrl: server.publicUrl,
119
+ appletPublicUrl: finalAppletPublicUrl,
108
120
  })];
109
121
  case 9:
110
122
  connection = _a.sent();
@@ -1 +1 @@
1
- {"version":3,"file":"connectCommand.js","sourceRoot":"","sources":["../../../src/Device/Connect/connectCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkE;AAClE,4EAK+C;AAC/C,0DAA8F;AAC9F,uCAAyD;AACzD,qEAA8F;AAC9F,sCAAmD;AACnD,yCAAoC;AACpC,sEAKyC;AAEzC,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,gCAAiB;IACjB,gCAAiB;IACjB,6CAAwB;IACxB,uCAAkB;IAClB,wCAAmB;CACV,CAAC;AAEE,QAAA,OAAO,GAAG,IAAA,2CAAuB,EAAC;IAC9C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,mBAAmB;IAChC,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACZ,GAAG,EAAE,UAAgB,OAA+C;;;;;;;wBAC7D,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;wBACf,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBAC3C,qBAAM,IAAA,kCAAyB,EAAC,YAAY,CAAC,EAAA;;wBAAvD,OAAO,GAAG,SAA6C;wBACvD,GAAG,GAAG,IAAA,uBAAiB,EAAC;4BAC7B,eAAe,EAAE,YAAY,CAAC,GAAG;yBACjC,CAAC,CAAC;wBAEe,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBAChC,qBAAM,IAAA,+BAAgB,EAAC,gBAAgB,CAAC,EAAA;;wBAAxD,aAAa,GAAG,SAAwC;wBAC5C,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBAEhD,UAAU,GAAG,OAAO,CAAC,uCAAkB,CAAC,IAAI,CAAC,CAAC;wBAC9C,eAAe,GAAG,OAAO,CAAC,6CAAwB,CAAC,IAAI,CAAC,CAAC;wBAE/D,qBAAM,IAAA,4DAAuC,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,CAAC,EAAA;;wBAAjG,SAAiG,CAAC;wBAEnF,qBAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;gCAC3C,SAAS,WAAA;gCACT,aAAa,eAAA;gCACb,IAAI,EAAE,UAAU;gCAChB,SAAS,EAAE,eAAe;6BAC1B,CAAC,EAAA;;wBALI,MAAM,GAAG,SAKb;wBACiB,qBAAM,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,EAAE;gCAC7D,SAAS,WAAA;gCACT,aAAa,eAAA;gCACb,eAAe,EAAE,MAAM,CAAC,SAAS;6BACjC,CAAC,EAAA;;wBAJI,UAAU,GAAG,SAIjB;wBAEI,UAAU,GAAG;;;4CAClB,qBAAM,UAAU,CAAC,UAAU,EAAE,EAAA;;wCAA7B,SAA6B,CAAC;wCAC9B,qBAAM,MAAM,CAAC,IAAI,EAAE,EAAA;;wCAAnB,SAAmB,CAAC;wCACpB,OAAO,CAAC,IAAI,EAAE,CAAC;;;;6BACf,CAAC;wBACF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;wBACjC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;wBAElC,OAAO,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;wBAC3C,qBAAM,IAAA,cAAI,EAAC,GAAG,CAAC,EAAA;;wBAAf,SAAe,CAAC,CAAC,eAAe;;;;;KAChC;CACD,CAAC,CAAC"}
1
+ {"version":3,"file":"connectCommand.js","sourceRoot":"","sources":["../../../src/Device/Connect/connectCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkE;AAClE,4EAK+C;AAC/C,0DAA8F;AAC9F,uCAAyD;AACzD,qEAA8F;AAC9F,sCAAmD;AACnD,yCAAoC;AACpC,sEAKyC;AACzC,+BAA0B;AAE1B,IAAM,KAAK,GAAG,IAAA,eAAK,EAAC,8CAA8C,CAAC,CAAC;AAEvD,QAAA,yBAAyB,GAAG;IACxC,IAAI,EAAE,oBAAoB;IAC1B,IAAI,EAAE,OAAO;IACb,WAAW,EACV,iFAAiF;QACjF,+EAA+E;CACvE,CAAC;AAEX,IAAM,WAAW,GAAG;IACnB,mDAA8B;IAC9B,4CAAuB;IACvB,gCAAiB;IACjB,gCAAiB;IACjB,6CAAwB;IACxB,uCAAkB;IAClB,wCAAmB;IACnB,iCAAyB;CAChB,CAAC;AAEE,QAAA,OAAO,GAAG,IAAA,2CAAuB,EAAC;IAC9C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,mBAAmB;IAChC,UAAU,EAAE,WAAW;IACvB,QAAQ,EAAE,EAAE;IACZ,GAAG,EAAE,UAAgB,OAA+C;;;;;;;wBAC7D,gBAAgB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;wBACf,qBAAM,IAAA,wDAAmC,EAAC,OAAO,CAAC,EAAA;;wBAApE,eAAe,GAAG,SAAkD;wBACrD,qBAAM,IAAA,oCAAe,EAAC,eAAe,CAAC,EAAA;;wBAArD,YAAY,GAAG,SAAsC;wBAC3C,qBAAM,IAAA,kCAAyB,EAAC,YAAY,CAAC,EAAA;;wBAAvD,OAAO,GAAG,SAA6C;wBACvD,GAAG,GAAG,IAAA,uBAAiB,EAAC;4BAC7B,eAAe,EAAE,YAAY,CAAC,GAAG;yBACjC,CAAC,CAAC;wBAEe,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBAChC,qBAAM,IAAA,+BAAgB,EAAC,gBAAgB,CAAC,EAAA;;wBAAxD,aAAa,GAAG,SAAwC;wBAC5C,qBAAM,IAAA,2BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAhD,SAAS,GAAG,SAAoC;wBAEhD,UAAU,GAAG,OAAO,CAAC,uCAAkB,CAAC,IAAI,CAAC,CAAC;wBAC9C,eAAe,GAAG,OAAO,CAAC,6CAAwB,CAAC,IAAI,CAAC,CAAC;wBACzD,gBAAgB,GAAG,OAAO,CAAC,iCAAyB,CAAC,IAAI,CAAC,CAAC;wBAEjE,qBAAM,IAAA,4DAAuC,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,CAAC,EAAA;;wBAAjG,SAAiG,CAAC;wBAEnF,qBAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;gCAC3C,SAAS,WAAA;gCACT,aAAa,eAAA;gCACb,IAAI,EAAE,UAAU;gCAChB,SAAS,EAAE,eAAe;6BAC1B,CAAC,EAAA;;wBALI,MAAM,GAAG,SAKb;wBACF,KAAK,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;wBAC7B,oBAAoB,GAAG,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAU,MAAM,CAAC,UAAU,cAAI,MAAM,CAAC,IAAI,CAAE,CAAC;wBAC7F,qBAAM,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,EAAE;gCAC7D,SAAS,WAAA;gCACT,aAAa,eAAA;gCACb,eAAe,EAAE,oBAAoB;6BACrC,CAAC,EAAA;;wBAJI,UAAU,GAAG,SAIjB;wBAEI,UAAU,GAAG;;;4CAClB,qBAAM,UAAU,CAAC,UAAU,EAAE,EAAA;;wCAA7B,SAA6B,CAAC;wCAC9B,qBAAM,MAAM,CAAC,IAAI,EAAE,EAAA;;wCAAnB,SAAmB,CAAC;wCACpB,OAAO,CAAC,IAAI,EAAE,CAAC;;;;6BACf,CAAC;wBACF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;wBACjC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;wBAElC,OAAO,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;wBAC3C,qBAAM,IAAA,cAAI,EAAC,GAAG,CAAC,EAAA;;wBAAf,SAAe,CAAC,CAAC,eAAe;;;;;KAChC;CACD,CAAC,CAAC"}
@@ -109,6 +109,10 @@ export declare const device: {
109
109
  readonly name: "force";
110
110
  readonly type: BooleanConstructor;
111
111
  readonly description: "Force start applet server even if it is already running on a different port. Kill the running server first.";
112
+ }, {
113
+ readonly name: "use-forward-server";
114
+ readonly type: BooleanConstructor;
115
+ readonly description: string;
112
116
  }];
113
117
  commands: never[];
114
118
  run: (options: import("../Command/commandDefinition").CommandLineOptions<readonly [{
@@ -139,6 +143,10 @@ export declare const device: {
139
143
  readonly name: "force";
140
144
  readonly type: BooleanConstructor;
141
145
  readonly description: "Force start applet server even if it is already running on a different port. Kill the running server first.";
146
+ }, {
147
+ readonly name: "use-forward-server";
148
+ readonly type: BooleanConstructor;
149
+ readonly description: string;
142
150
  }]>) => Promise<void>;
143
151
  })[];
144
152
  run(): Promise<never>;
@@ -78,7 +78,9 @@ function createEmulator(params, organizationUid, dev) {
78
78
  res.redirect("".concat(req.originalUrl).concat(req.originalUrl.includes('?') ? '&' : '?', "duid=").concat(params.emulatorUid));
79
79
  }
80
80
  else {
81
- res.send("<script>\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET = {};\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.binaryFile = location.origin + ".concat(JSON.stringify(envVars.binaryFilePath), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.uid = ").concat(JSON.stringify(envVars.uid), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.version = ").concat(JSON.stringify(envVars.version), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.checksum = ").concat(JSON.stringify(envVars.checksum), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.frontAppletVersion = ").concat(JSON.stringify(envVars.frontAppletVersion), ";\n\t\t\t\t\twindow.__SOS_BUNDLED_APPLET.frontAppletBinaryFile = ").concat(JSON.stringify(envVars.frontAppletBinaryFile), ";\n\t\t\t\t\twindow.__SOS_AUTO_VERIFICATION = {};\n\t\t\t\t\twindow.__SOS_AUTO_VERIFICATION.organizationUid = ").concat(JSON.stringify(envVars.organizationUid), ";\n\t\t\t\t</script>") + fsExtra.readFileSync(path.join(frontDisplayDistPath, 'index.html')).toString());
81
+ var page = fsExtra.readFileSync(path.join(frontDisplayDistPath, 'index.html')).toString();
82
+ var script = "\n<script>\n\twindow.__SOS_BUNDLED_APPLET = {};\n\twindow.__SOS_BUNDLED_APPLET.binaryFile = location.origin + ".concat(JSON.stringify(envVars.binaryFilePath), ";\n\twindow.__SOS_BUNDLED_APPLET.uid = ").concat(JSON.stringify(envVars.uid), ";\n\twindow.__SOS_BUNDLED_APPLET.version = ").concat(JSON.stringify(envVars.version), ";\n\twindow.__SOS_BUNDLED_APPLET.checksum = ").concat(JSON.stringify(envVars.checksum), ";\n\twindow.__SOS_BUNDLED_APPLET.frontAppletVersion = ").concat(JSON.stringify(envVars.frontAppletVersion), ";\n\twindow.__SOS_BUNDLED_APPLET.frontAppletBinaryFile = ").concat(JSON.stringify(envVars.frontAppletBinaryFile), ";\n\twindow.__SOS_AUTO_VERIFICATION = {};\n\twindow.__SOS_AUTO_VERIFICATION.organizationUid = ").concat(JSON.stringify(envVars.organizationUid), ";\n</script>");
83
+ res.send(page.replace('</head>', "".concat(script, "</head>")));
82
84
  }
83
85
  });
84
86
  app.use(serveStatic(frontDisplayDistPath));
@@ -88,7 +90,7 @@ function createEmulator(params, organizationUid, dev) {
88
90
  (0, log_1.log)('info', "Emulator is running at ".concat(chalk_1.default.blue(chalk_1.default.bold(emulatorUrl))));
89
91
  });
90
92
  app.use(APPLET_DIRECTORY_PATH, function (req, res) { return __awaiter(_this, void 0, void 0, function () {
91
- var fileUrl, relativeFilePath, absoluteFilePath, appletFilePaths, prependFileContent, entryFileContent, contentType, readStream;
93
+ var fileUrl, relativeFilePath, absoluteFilePath, appletFilePaths, prependFileContent, page, contentType, readStream;
92
94
  return __generator(this, function (_a) {
93
95
  switch (_a.label) {
94
96
  case 0:
@@ -105,12 +107,12 @@ function createEmulator(params, organizationUid, dev) {
105
107
  return [2 /*return*/];
106
108
  }
107
109
  if (!(relativeFilePath === entryFileRelativePath)) return [3 /*break*/, 3];
108
- prependFileContent = '<script>window.onunload = function () { window.parent.location.reload(); }</script>';
110
+ prependFileContent = '<script>window.onbeforeunload = function () { window.parent.location.reload(); }</script>';
109
111
  res.setHeader('Content-Type', 'text/html');
110
112
  return [4 /*yield*/, fsExtra.readFile(entryFileAbsolutePath, 'utf8')];
111
113
  case 2:
112
- entryFileContent = _a.sent();
113
- res.send(prependFileContent + entryFileContent);
114
+ page = _a.sent();
115
+ res.send(page.replace('</head>', "".concat(prependFileContent, "</head>")));
114
116
  return [2 /*return*/];
115
117
  case 3:
116
118
  contentType = mime.getType(absoluteFilePath) || 'application/octet-stream';
@@ -1 +1 @@
1
- {"version":3,"file":"emulatorFactory.js","sourceRoot":"","sources":["../../src/Emulator/emulatorFactory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"emulatorFactory.js","sourceRoot":"","sources":["../../src/Emulator/emulatorFactory.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@signageos/cli",
3
- "version": "1.6.4",
3
+ "version": "1.7.1",
4
4
  "main": "./dist/index.js",
5
5
  "files": [
6
6
  ".env",
@@ -16,8 +16,8 @@
16
16
  "build": "npx check-engine@latest && tsc",
17
17
  "lint:eslint": "eslint --ext .ts,.tsx,.js,.json ./src/ ./tests",
18
18
  "lint": "npm run lint:eslint",
19
- "prebuild": "rm -rf dist/*",
20
- "prepare": "npm run prebuild && npm run build && chmod +x dist/index.js && husky",
19
+ "clean": "rm -rf dist/*",
20
+ "clean-build": "npm run clean && npm run build && chmod +x dist/index.js && husky",
21
21
  "test": "env NODE_ENV=test mocha --config .mocharc.unit.json",
22
22
  "test-integration": "env NODE_ENV=test mocha --config .mocharc.integration.json",
23
23
  "test:coverage": "c8 npm run test",
@@ -72,7 +72,7 @@
72
72
  },
73
73
  "dependencies": {
74
74
  "@signageos/file": "0.1.1",
75
- "@signageos/sdk": "1.25.0",
75
+ "@signageos/sdk": "1.26.1",
76
76
  "chalk": "2.4.2",
77
77
  "child-process-promise": "2.2.1",
78
78
  "cli-progress": "3.8.2",