@dataramen/cli 0.0.7 → 0.0.8

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.
Files changed (4) hide show
  1. package/bin/run.js +53 -19
  2. package/dist/code/cli.js +53 -19
  3. package/dist/package.json +1 -1
  4. package/package.json +4 -4
package/bin/run.js CHANGED
@@ -11,7 +11,9 @@ const processName = "@dataramen/local-server";
11
11
  const homeDir = os.homedir();
12
12
  const filesPath = path.join(homeDir, ".dataramen", ".runtime", "server");
13
13
 
14
- const scriptPkg = fs.readJsonSync(path.join(__dirname, "..", "package.json"));
14
+ const scriptPkg = useJson(path.join(__dirname, "..", "package.json"));
15
+ const serverPkg = useJson(path.join(filesPath, "package.json"));
16
+
15
17
  const protocol = "dataramen://";
16
18
 
17
19
  yargs()
@@ -23,7 +25,7 @@ yargs()
23
25
 
24
26
  start();
25
27
  })
26
- .command("logs", 'Listen for logs', () => {
28
+ .command(["logs"], 'Listen for logs', () => {
27
29
  execSync(`pm2 logs ${processName}`, {
28
30
  stdio: "inherit",
29
31
  });
@@ -38,10 +40,25 @@ yargs()
38
40
  require(path.join(__dirname, "..", "dist", "code", "register.windows.js")).unregister();
39
41
  }
40
42
  })
43
+ .command(["version"], 'Show version', () => {
44
+ console.log(`Data ramen CLI version: ${scriptPkg().version}`);
45
+ console.log(`Data ramen local server version: ${serverPkg().version}`);
46
+ })
41
47
  .parse(isBrowserStart() ? getBrowserArgs() : yargsHelpers.hideBin(process.argv));
42
48
 
43
- function isInstallation () {
44
- return scriptPkg.name === "@dataramen/cli";
49
+ function shouldInstall () {
50
+ try {
51
+ const installedProxyPkjJson = serverPkg();
52
+
53
+ if (!installedProxyPkjJson) {
54
+ return true;
55
+ }
56
+
57
+ const thisProxyPkgJson = fs.readJsonSync(path.join(__dirname, '..', 'dist', "package.json"));
58
+ return installedProxyPkjJson.version !== thisProxyPkgJson.version; // version are different, install new code
59
+ } catch (e) {
60
+ return true;
61
+ }
45
62
  }
46
63
 
47
64
  function isBrowserStart () {
@@ -80,17 +97,17 @@ function stopExisting () {
80
97
  } catch (e) {}
81
98
  }
82
99
 
83
- function registerServer () {
84
- try {
85
- if (os.platform() === "win32") {
86
- require(path.join(__dirname, "..", "dist", "code", "register.windows.js")).register();
87
- }
88
-
89
- console.log("Custom protocol handler registered");
90
- } catch (e) {
91
- console.log("Failed to register server", e);
92
- }
93
- }
100
+ // function registerServer () {
101
+ // try {
102
+ // if (os.platform() === "win32") {
103
+ // require(path.join(__dirname, "..", "dist", "code", "register.windows.js")).register();
104
+ // }
105
+ //
106
+ // console.log("Custom protocol handler registered");
107
+ // } catch (e) {
108
+ // console.log("Failed to register server", e);
109
+ // }
110
+ // }
94
111
 
95
112
  function installServer () {
96
113
  console.log("Installing Server");
@@ -107,16 +124,14 @@ function installServer () {
107
124
  });
108
125
  console.log("Server installed");
109
126
 
110
- registerServer();
127
+ // registerServer();
111
128
  }
112
129
 
113
130
  function start () {
114
131
  stopExisting();
115
132
 
116
133
  try {
117
- if (isInstallation()) {
118
- // only install if script is running from @dataramen/cli package
119
- // if not, it means it was already installed, and the script is running from within the server folder
134
+ if (shouldInstall()) {
120
135
  installServer();
121
136
  }
122
137
 
@@ -129,7 +144,26 @@ function start () {
129
144
 
130
145
  console.log(`Local server will be available in a couple of seconds`);
131
146
  console.log(`You can close this window`);
147
+ console.log(`Visit https://app.dataramen.xyz`);
132
148
  } catch (e) {
133
149
  console.error(`Failed to start local server`, e);
134
150
  }
135
151
  }
152
+
153
+ function useJson (path) {
154
+ let file = undefined;
155
+
156
+ function get () {
157
+ try {
158
+ if (!file) {
159
+ file = fs.readJsonSync(path);
160
+ }
161
+
162
+ return file;
163
+ } catch (e) {
164
+ return undefined;
165
+ }
166
+ }
167
+
168
+ return get;
169
+ }
package/dist/code/cli.js CHANGED
@@ -11,7 +11,9 @@ const processName = "@dataramen/local-server";
11
11
  const homeDir = os.homedir();
12
12
  const filesPath = path.join(homeDir, ".dataramen", ".runtime", "server");
13
13
 
14
- const scriptPkg = fs.readJsonSync(path.join(__dirname, "..", "package.json"));
14
+ const scriptPkg = useJson(path.join(__dirname, "..", "package.json"));
15
+ const serverPkg = useJson(path.join(filesPath, "package.json"));
16
+
15
17
  const protocol = "dataramen://";
16
18
 
17
19
  yargs()
@@ -23,7 +25,7 @@ yargs()
23
25
 
24
26
  start();
25
27
  })
26
- .command("logs", 'Listen for logs', () => {
28
+ .command(["logs"], 'Listen for logs', () => {
27
29
  execSync(`pm2 logs ${processName}`, {
28
30
  stdio: "inherit",
29
31
  });
@@ -38,10 +40,25 @@ yargs()
38
40
  require(path.join(__dirname, "..", "dist", "code", "register.windows.js")).unregister();
39
41
  }
40
42
  })
43
+ .command(["version"], 'Show version', () => {
44
+ console.log(`Data ramen CLI version: ${scriptPkg().version}`);
45
+ console.log(`Data ramen local server version: ${serverPkg().version}`);
46
+ })
41
47
  .parse(isBrowserStart() ? getBrowserArgs() : yargsHelpers.hideBin(process.argv));
42
48
 
43
- function isInstallation () {
44
- return scriptPkg.name === "@dataramen/cli";
49
+ function shouldInstall () {
50
+ try {
51
+ const installedProxyPkjJson = serverPkg();
52
+
53
+ if (!installedProxyPkjJson) {
54
+ return true;
55
+ }
56
+
57
+ const thisProxyPkgJson = fs.readJsonSync(path.join(__dirname, '..', 'dist', "package.json"));
58
+ return installedProxyPkjJson.version !== thisProxyPkgJson.version; // version are different, install new code
59
+ } catch (e) {
60
+ return true;
61
+ }
45
62
  }
46
63
 
47
64
  function isBrowserStart () {
@@ -80,17 +97,17 @@ function stopExisting () {
80
97
  } catch (e) {}
81
98
  }
82
99
 
83
- function registerServer () {
84
- try {
85
- if (os.platform() === "win32") {
86
- require(path.join(__dirname, "..", "dist", "code", "register.windows.js")).register();
87
- }
88
-
89
- console.log("Custom protocol handler registered");
90
- } catch (e) {
91
- console.log("Failed to register server", e);
92
- }
93
- }
100
+ // function registerServer () {
101
+ // try {
102
+ // if (os.platform() === "win32") {
103
+ // require(path.join(__dirname, "..", "dist", "code", "register.windows.js")).register();
104
+ // }
105
+ //
106
+ // console.log("Custom protocol handler registered");
107
+ // } catch (e) {
108
+ // console.log("Failed to register server", e);
109
+ // }
110
+ // }
94
111
 
95
112
  function installServer () {
96
113
  console.log("Installing Server");
@@ -107,16 +124,14 @@ function installServer () {
107
124
  });
108
125
  console.log("Server installed");
109
126
 
110
- registerServer();
127
+ // registerServer();
111
128
  }
112
129
 
113
130
  function start () {
114
131
  stopExisting();
115
132
 
116
133
  try {
117
- if (isInstallation()) {
118
- // only install if script is running from @dataramen/cli package
119
- // if not, it means it was already installed, and the script is running from within the server folder
134
+ if (shouldInstall()) {
120
135
  installServer();
121
136
  }
122
137
 
@@ -129,7 +144,26 @@ function start () {
129
144
 
130
145
  console.log(`Local server will be available in a couple of seconds`);
131
146
  console.log(`You can close this window`);
147
+ console.log(`Visit https://app.dataramen.xyz`);
132
148
  } catch (e) {
133
149
  console.error(`Failed to start local server`, e);
134
150
  }
135
151
  }
152
+
153
+ function useJson (path) {
154
+ let file = undefined;
155
+
156
+ function get () {
157
+ try {
158
+ if (!file) {
159
+ file = fs.readJsonSync(path);
160
+ }
161
+
162
+ return file;
163
+ } catch (e) {
164
+ return undefined;
165
+ }
166
+ }
167
+
168
+ return get;
169
+ }
package/dist/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@dataramen/local-server","version":"0.0.33","license":"MIT","main":"code/proxy.js","dependencies":{"@fastify/cors":"^11.0.1","dotenv":"^16.5.0","fast-glob":"^3.3.3","fastify":"^5.3.2","mysql2":"^3.14.1","pg":"^8.15.6","sqlite3":"^5.1.7","typeorm":"^0.3.23"},"devDependencies":{"yargs":"^18.0.0","fs-extra":"^11.3.0"}}
1
+ {"name":"@dataramen/local-server","version":"0.0.34","license":"MIT","main":"code/proxy.js","dependencies":{"@fastify/cors":"^11.0.1","dotenv":"^16.5.0","fast-glob":"^3.3.3","fastify":"^5.3.2","mysql2":"^3.14.1","pg":"^8.15.6","sqlite3":"^5.1.7","typeorm":"^0.3.23"},"devDependencies":{"fs-extra":"^11.3.0","yargs":"^18.0.0"}}
package/package.json CHANGED
@@ -1,16 +1,16 @@
1
1
  {
2
2
  "name": "@dataramen/cli",
3
- "version": "0.0.7",
3
+ "version": "0.0.8",
4
4
  "license": "MIT",
5
5
  "bin": {
6
- "dataramen-cli": "bin/run.js"
6
+ "dataramen": "bin/run.js"
7
7
  },
8
8
  "scripts": {
9
9
  "build": "node build.js"
10
10
  },
11
11
  "dependencies": {
12
- "yargs": "^18.0.0",
13
- "fs-extra": "^11.3.0"
12
+ "fs-extra": "^11.3.0",
13
+ "yargs": "^18.0.0"
14
14
  },
15
15
  "files": [
16
16
  "dist/"