@terreno/rtk 0.0.17 → 0.1.0

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/dist/constants.js +38 -25
  2. package/dist/constants.js.map +1 -1
  3. package/package.json +3 -2
  4. package/src/constants.ts +42 -26
package/dist/constants.js CHANGED
@@ -32,45 +32,58 @@ if (Constants.expoGoConfig?.debuggerHost?.includes("exp.direct")) {
32
32
  export let baseUrl;
33
33
  export let baseWebsocketsUrl;
34
34
  export let baseTasksUrl;
35
- if (Constants.expoConfig?.extra?.BASE_URL) {
36
- // For prod/staging
37
- baseUrl = Constants.expoConfig?.extra?.BASE_URL;
35
+ const isDev = typeof __DEV__ !== "undefined" && __DEV__;
36
+ if (process.env.EXPO_PUBLIC_API_URL) {
37
+ // Explicit override (e.g. .env)
38
+ baseUrl = process.env.EXPO_PUBLIC_API_URL;
38
39
  baseWebsocketsUrl = `${baseUrl.replace("api.", "ws.")}/`;
39
40
  baseTasksUrl = `${baseUrl.replace("api.", "tasks.")}/tasks`;
40
41
  console.debug(`Base URL set to apiUrl ${baseUrl} for env ${Constants.expoConfig?.extra?.APP_ENV ?? "unknown"}, websocket to ${baseWebsocketsUrl}, tasks to ${baseTasksUrl}`);
41
42
  }
42
- else if (process.env.EXPO_PUBLIC_API_URL) {
43
- // For dev web
44
- baseUrl = process.env.EXPO_PUBLIC_API_URL;
43
+ else if (isDev && Constants.expoConfig?.hostUri) {
44
+ // Dev simulator/device
45
+ baseUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}`;
46
+ baseWebsocketsUrl = `ws://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/`;
47
+ baseTasksUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/tasks`;
48
+ console.debug(`Base URL set to hostUri ${baseUrl}, websocket to ${baseWebsocketsUrl}`, Constants.expoConfig?.hostUri);
49
+ }
50
+ else if (isDev && Constants.experienceUrl) {
51
+ // Dev web (experienceUrl)
52
+ baseUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}`;
53
+ baseWebsocketsUrl = `ws:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/`;
54
+ baseTasksUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/tasks`;
55
+ console.debug(`Base URL set to experienceUrl ${baseUrl}, websocket to ${baseWebsocketsUrl}`, Constants.expoConfig?.hostUri);
56
+ }
57
+ else if (isDev) {
58
+ // Dev web fallback
59
+ baseUrl = `http://localhost:4000`;
60
+ baseWebsocketsUrl = `ws://localhost:4000/`;
61
+ baseTasksUrl = `http://localhost:4000/tasks`;
62
+ console.debug(`Base URL set to localhost ${baseUrl}, websocket to ${baseWebsocketsUrl}`);
63
+ }
64
+ else if (Constants.expoConfig?.extra?.BASE_URL) {
65
+ // Prod/staging
66
+ baseUrl = Constants.expoConfig?.extra?.BASE_URL;
45
67
  baseWebsocketsUrl = `${baseUrl.replace("api.", "ws.")}/`;
46
68
  baseTasksUrl = `${baseUrl.replace("api.", "tasks.")}/tasks`;
47
69
  console.debug(`Base URL set to apiUrl ${baseUrl} for env ${Constants.expoConfig?.extra?.APP_ENV ?? "unknown"}, websocket to ${baseWebsocketsUrl}, tasks to ${baseTasksUrl}`);
48
70
  }
49
71
  else if (Constants.expoConfig?.hostUri) {
50
- // For dev simulator/device
51
- baseUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":3000")}`;
52
- baseWebsocketsUrl = `ws://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":3000")}/`;
53
- baseTasksUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":3000")}/tasks`;
72
+ baseUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}`;
73
+ baseWebsocketsUrl = `ws://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/`;
74
+ baseTasksUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/tasks`;
54
75
  console.debug(`Base URL set to hostUri ${baseUrl}, websocket to ${baseWebsocketsUrl}`, Constants.expoConfig?.hostUri);
55
76
  }
56
77
  else if (Constants.experienceUrl) {
57
- // For dev web
58
- baseUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":3000")}`;
59
- baseWebsocketsUrl = `ws:${Constants.experienceUrl?.split(`:`)[1]?.concat(":3000")}/`;
60
- baseTasksUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":3000")}/tasks`;
78
+ baseUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}`;
79
+ baseWebsocketsUrl = `ws:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/`;
80
+ baseTasksUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/tasks`;
61
81
  console.debug(`Base URL set to experienceUrl ${baseUrl}, websocket to ${baseWebsocketsUrl}`, Constants.expoConfig?.hostUri);
62
82
  }
63
- else if (!Constants.expoConfig?.extra?.BASE_URL &&
64
- !Constants.expoConfig?.hostUri &&
65
- !Constants.experienceUrl) {
66
- // For dev web, which doesn't have experienceUrl for some reason?
67
- baseUrl = `http://localhost:3000`;
68
- baseWebsocketsUrl = `ws://localhost:3000/`;
69
- baseTasksUrl = `http://localhost:3000/tasks`;
70
- console.debug(`Base URL set to localhost ${baseUrl}, websocket to ${baseWebsocketsUrl}`);
71
- }
72
83
  else {
73
- console.error("No base URL found", Constants.expoConfig, Constants.experienceUrl);
74
- throw new Error("No base URL found");
84
+ baseUrl = `http://localhost:4000`;
85
+ baseWebsocketsUrl = `ws://localhost:4000/`;
86
+ baseTasksUrl = `http://localhost:4000/tasks`;
87
+ console.debug(`Base URL set to localhost ${baseUrl}, websocket to ${baseWebsocketsUrl}`);
75
88
  }
76
89
  //# sourceMappingURL=constants.js.map
package/dist/constants.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "dependencies": {
3
3
  "@react-native-async-storage/async-storage": "2.2.0",
4
4
  "@reduxjs/toolkit": "^2.11.1",
5
- "@terreno/ui": "0.0.17",
5
+ "@terreno/ui": "0.1.0",
6
6
  "async-mutex": "^0.5.0",
7
7
  "axios": "^1.13.2",
8
8
  "axios-retry": "^4.5.0",
@@ -38,6 +38,7 @@
38
38
  },
39
39
  "scripts": {
40
40
  "compile": "tsc",
41
+ "compile:watch": "tsc -w",
41
42
  "dev": "tsc -w",
42
43
  "lint": "biome check .",
43
44
  "lint:fix": "biome check --write .",
@@ -45,5 +46,5 @@
45
46
  "test:ci": "echo 'No tests'"
46
47
  },
47
48
  "types": "dist/index.d.ts",
48
- "version": "0.0.17"
49
+ "version": "0.1.0"
49
50
  }
package/src/constants.ts CHANGED
@@ -49,9 +49,11 @@ export let baseUrl: string;
49
49
  export let baseWebsocketsUrl: string;
50
50
  export let baseTasksUrl: string;
51
51
 
52
- if (Constants.expoConfig?.extra?.BASE_URL) {
53
- // For prod/staging
54
- baseUrl = Constants.expoConfig?.extra?.BASE_URL;
52
+ const isDev = typeof __DEV__ !== "undefined" && __DEV__;
53
+
54
+ if (process.env.EXPO_PUBLIC_API_URL) {
55
+ // Explicit override (e.g. .env)
56
+ baseUrl = process.env.EXPO_PUBLIC_API_URL;
55
57
  baseWebsocketsUrl = `${baseUrl.replace("api.", "ws.")}/`;
56
58
  baseTasksUrl = `${baseUrl.replace("api.", "tasks.")}/tasks`;
57
59
 
@@ -60,9 +62,33 @@ if (Constants.expoConfig?.extra?.BASE_URL) {
60
62
  Constants.expoConfig?.extra?.APP_ENV ?? "unknown"
61
63
  }, websocket to ${baseWebsocketsUrl}, tasks to ${baseTasksUrl}`
62
64
  );
63
- } else if (process.env.EXPO_PUBLIC_API_URL) {
64
- // For dev web
65
- baseUrl = process.env.EXPO_PUBLIC_API_URL;
65
+ } else if (isDev && Constants.expoConfig?.hostUri) {
66
+ // Dev simulator/device
67
+ baseUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}`;
68
+ baseWebsocketsUrl = `ws://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/`;
69
+ baseTasksUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/tasks`;
70
+ console.debug(
71
+ `Base URL set to hostUri ${baseUrl}, websocket to ${baseWebsocketsUrl}`,
72
+ Constants.expoConfig?.hostUri
73
+ );
74
+ } else if (isDev && Constants.experienceUrl) {
75
+ // Dev web (experienceUrl)
76
+ baseUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}`;
77
+ baseWebsocketsUrl = `ws:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/`;
78
+ baseTasksUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/tasks`;
79
+ console.debug(
80
+ `Base URL set to experienceUrl ${baseUrl}, websocket to ${baseWebsocketsUrl}`,
81
+ Constants.expoConfig?.hostUri
82
+ );
83
+ } else if (isDev) {
84
+ // Dev web fallback
85
+ baseUrl = `http://localhost:4000`;
86
+ baseWebsocketsUrl = `ws://localhost:4000/`;
87
+ baseTasksUrl = `http://localhost:4000/tasks`;
88
+ console.debug(`Base URL set to localhost ${baseUrl}, websocket to ${baseWebsocketsUrl}`);
89
+ } else if (Constants.expoConfig?.extra?.BASE_URL) {
90
+ // Prod/staging
91
+ baseUrl = Constants.expoConfig?.extra?.BASE_URL;
66
92
  baseWebsocketsUrl = `${baseUrl.replace("api.", "ws.")}/`;
67
93
  baseTasksUrl = `${baseUrl.replace("api.", "tasks.")}/tasks`;
68
94
 
@@ -72,34 +98,24 @@ if (Constants.expoConfig?.extra?.BASE_URL) {
72
98
  }, websocket to ${baseWebsocketsUrl}, tasks to ${baseTasksUrl}`
73
99
  );
74
100
  } else if (Constants.expoConfig?.hostUri) {
75
- // For dev simulator/device
76
- baseUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":3000")}`;
77
- baseWebsocketsUrl = `ws://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":3000")}/`;
78
- baseTasksUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":3000")}/tasks`;
101
+ baseUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}`;
102
+ baseWebsocketsUrl = `ws://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/`;
103
+ baseTasksUrl = `http://${Constants.expoConfig?.hostUri?.split(`:`).shift()?.concat(":4000")}/tasks`;
79
104
  console.debug(
80
105
  `Base URL set to hostUri ${baseUrl}, websocket to ${baseWebsocketsUrl}`,
81
106
  Constants.expoConfig?.hostUri
82
107
  );
83
108
  } else if (Constants.experienceUrl) {
84
- // For dev web
85
- baseUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":3000")}`;
86
- baseWebsocketsUrl = `ws:${Constants.experienceUrl?.split(`:`)[1]?.concat(":3000")}/`;
87
- baseTasksUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":3000")}/tasks`;
109
+ baseUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}`;
110
+ baseWebsocketsUrl = `ws:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/`;
111
+ baseTasksUrl = `http:${Constants.experienceUrl?.split(`:`)[1]?.concat(":4000")}/tasks`;
88
112
  console.debug(
89
113
  `Base URL set to experienceUrl ${baseUrl}, websocket to ${baseWebsocketsUrl}`,
90
114
  Constants.expoConfig?.hostUri
91
115
  );
92
- } else if (
93
- !Constants.expoConfig?.extra?.BASE_URL &&
94
- !Constants.expoConfig?.hostUri &&
95
- !Constants.experienceUrl
96
- ) {
97
- // For dev web, which doesn't have experienceUrl for some reason?
98
- baseUrl = `http://localhost:3000`;
99
- baseWebsocketsUrl = `ws://localhost:3000/`;
100
- baseTasksUrl = `http://localhost:3000/tasks`;
101
- console.debug(`Base URL set to localhost ${baseUrl}, websocket to ${baseWebsocketsUrl}`);
102
116
  } else {
103
- console.error("No base URL found", Constants.expoConfig, Constants.experienceUrl);
104
- throw new Error("No base URL found");
117
+ baseUrl = `http://localhost:4000`;
118
+ baseWebsocketsUrl = `ws://localhost:4000/`;
119
+ baseTasksUrl = `http://localhost:4000/tasks`;
120
+ console.debug(`Base URL set to localhost ${baseUrl}, websocket to ${baseWebsocketsUrl}`);
105
121
  }