Skip to content

Commit 09b0d74

Browse files
KernelDeimosKernelDeimos
committed
clean: remove redundant promise.js
1 parent 86a9c95 commit 09b0d74

28 files changed

+30
-188
lines changed

Diff for: ‎src/backend/src/filesystem/batch/BatchExecutor.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const commands = require('./commands').commands;
2222
const APIError = require('../../api/APIError');
2323
const { Context } = require('../../util/context');
2424
const config = require('../../config');
25-
const { TeePromise } = require('../../util/promise');
25+
const { TeePromise } = require('@heyputer/putility');
2626
const { WorkUnit } = require('../../modules/core/lib/expect');
2727

2828
class BatchExecutor extends AdvancedBase {

Diff for: ‎src/backend/src/filesystem/hl_operations/hl_write.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const StringParam = require("../../api/filesystem/StringParam");
2323
const UserParam = require("../../api/filesystem/UserParam");
2424
const config = require("../../config");
2525
const { chkperm, validate_fsentry_name } = require("../../helpers");
26-
const { TeePromise } = require("../../util/promise");
26+
const { TeePromise } = require("@heyputer/putility").libs.promise;
2727
const { pausing_tee, logging_stream, offset_write_stream, stream_to_the_void } = require("../../util/streamutil");
2828
const { TYPE_DIRECTORY } = require("../FSNodeContext");
2929
const { LLRead } = require("../ll_operations/ll_read");

Diff for: ‎src/backend/src/fun/dev-console-ui-utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1818
*/
1919
const config = require('../config');
20-
const { TeePromise } = require('../util/promise');
20+
const { TeePromise } = require('@heyputer/putility').libs.promise;
2121

2222
const es_import_promise = new TeePromise();
2323
let stringLength;

Diff for: ‎src/backend/src/modules/puterai/ClaudeService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const { whatis } = require("../../util/langutil");
55
const { PassThrough } = require("stream");
66
const { TypedValue } = require("../../services/drivers/meta/Runtime");
77
const APIError = require("../../api/APIError");
8-
const { TeePromise } = require("../../util/promise");
8+
const { TeePromise } = require('@heyputer/putility').libs.promise;
99

1010
const PUTER_PROMPT = `
1111
You are running on an open-source platform called Puter,

Diff for: ‎src/backend/src/modules/puterai/GroqAIService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { PassThrough } = require("stream");
33
const BaseService = require("../../services/BaseService");
44
const { TypedValue } = require("../../services/drivers/meta/Runtime");
55
const { nou } = require("../../util/langutil");
6-
const { TeePromise } = require("../../util/promise");
6+
const { TeePromise } = require('@heyputer/putility').libs.promise;
77

88

99
/**

Diff for: ‎src/backend/src/modules/puterai/MistralAIService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const { TypedValue } = require("../../services/drivers/meta/Runtime");
55
const { nou } = require("../../util/langutil");
66

77
const axios = require('axios');
8-
const { TeePromise } = require("../../util/promise");
8+
const { TeePromise } = require('@heyputer/putility').libs.promise;
99

1010

1111
/**

Diff for: ‎src/backend/src/modules/puterai/OpenAICompletionService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const { TypedValue } = require('../../services/drivers/meta/Runtime');
66
const { Context } = require('../../util/context');
77
const SmolUtil = require('../../util/smolutil');
88
const { nou } = require('../../util/langutil');
9-
const { TeePromise } = require('../../util/promise');
9+
const { TeePromise } = require('@heyputer/putility').libs.promise;
1010

1111

1212
/**

Diff for: ‎src/backend/src/modules/puterai/TogetherAIService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { PassThrough } = require("stream");
33
const BaseService = require("../../services/BaseService");
44
const { TypedValue } = require("../../services/drivers/meta/Runtime");
55
const { nou } = require("../../util/langutil");
6-
const { TeePromise } = require("../../util/promise");
6+
const { TeePromise } = require('@heyputer/putility').libs.promise;
77

88

99
/**

Diff for: ‎src/backend/src/modules/puterai/XAIService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const BaseService = require("../../services/BaseService");
44
const { whatis, nou } = require("../../util/langutil");
55
const { PassThrough } = require("stream");
66
const { TypedValue } = require("../../services/drivers/meta/Runtime");
7-
const { TeePromise } = require("../../util/promise");
7+
const { TeePromise } = require('@heyputer/putility').libs.promise;
88

99
const PUTER_PROMPT = `
1010
You are running on an open-source platform called Puter,

Diff for: ‎src/backend/src/modules/selfhosted/DefaultUserService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const { NodePathSelector } = require("../../filesystem/node/selectors");
2222
const { surrounding_box } = require("../../fun/dev-console-ui-utils");
2323
const { get_user, invalidate_cached_user } = require("../../helpers");
2424
const { Context } = require("../../util/context");
25-
const { asyncSafeSetInterval } = require("../../util/promise");
25+
const { asyncSafeSetInterval } = require('@heyputer/putility').libs.promise;
2626
const { buffer_to_stream } = require("../../util/streamutil");
2727
const BaseService = require("../../services/BaseService");
2828
const { Actor, UserActorType } = require("../../services/auth/Actor");

Diff for: ‎src/backend/src/routers/drivers/call.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const { TypeSpec } = require("../../services/drivers/meta/Construct");
2323
const { TypedValue } = require("../../services/drivers/meta/Runtime");
2424
const { Context } = require("../../util/context");
2525
const { whatis } = require("../../util/langutil");
26-
const { TeePromise } = require("../../util/promise");
26+
const { TeePromise } = require('@heyputer/putility').libs.promise;
2727
const { valid_file_size } = require("../../util/validutil");
2828

2929
let _handle_multipart;

Diff for: ‎src/backend/src/routers/filesystem_api/batch/all.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const PathResolver = require("./PathResolver");
2323
const { Context } = require("../../../util/context");
2424
const Busboy = require('busboy');
2525
const { BatchExecutor } = require("../../../filesystem/batch/BatchExecutor");
26-
const { TeePromise } = require("../../../util/promise");
26+
const { TeePromise } = require('@heyputer/putility').libs.promise;
2727
const { EWMA, MovingMode } = require("../../../util/opmath");
2828
const { get_app } = require('../../../helpers');
2929
const { valid_file_size } = require("../../../util/validutil");

Diff for: ‎src/backend/src/routers/filesystem_api/write.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const { HLWrite } = require('../../filesystem/hl_operations/hl_write.js');
2323
const { boolify } = require('../../util/hl_types.js');
2424
const { Context } = require('../../util/context.js');
2525
const Busboy = require('busboy');
26-
const { TeePromise } = require('../../util/promise.js');
26+
const { TeePromise } = require('@heyputer/putility').libs.promise;
2727
const APIError = require('../../api/APIError.js');
2828
const { valid_file_size } = require('../../util/validutil.js');
2929

Diff for: ‎src/backend/src/services/AppInformationService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* You should have received a copy of the GNU Affero General Public License
1818
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1919
*/
20-
const { asyncSafeSetInterval } = require("../util/promise");
20+
const { asyncSafeSetInterval } = require('@heyputer/putility').libs.promise;
2121
const { MINUTE, SECOND } = require("@heyputer/putility").libs.time;
2222
const { origin_from_url } = require("../util/urlutil");
2323
const { DB_READ } = require("./database/consts");

Diff for: ‎src/backend/src/services/Container.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const { AdvancedBase } = require("@heyputer/putility");
2121
const config = require("../config");
2222
const { Context } = require("../util/context");
2323
const { CompositeError } = require("../util/errorutil");
24-
const { TeePromise } = require("../util/promise");
24+
const { TeePromise } = require('@heyputer/putility').libs.promise;
2525

2626
// 17 lines of code instead of an entire dependency-injection framework
2727
/**

Diff for: ‎src/backend/src/services/LocalDiskStorageService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1919
*/
2020
const { LocalDiskStorageStrategy } = require("../filesystem/strategies/storage_a/LocalDiskStorageStrategy");
21-
const { TeePromise } = require("../util/promise");
21+
const { TeePromise } = require('@heyputer/putility').libs.promise;
2222
const { progress_stream, size_limit_stream } = require("../util/streamutil");
2323
const BaseService = require("./BaseService");
2424

Diff for: ‎src/backend/src/services/NotificationService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
const APIError = require("../api/APIError");
2121
const auth2 = require("../middleware/auth2");
2222
const { Endpoint } = require("../util/expressutil");
23-
const { TeePromise } = require("../util/promise");
23+
const { TeePromise } = require('@heyputer/putility').libs.promise;
2424
const BaseService = require("./BaseService");
2525
const { DB_WRITE } = require("./database/consts");
2626

Diff for: ‎src/backend/src/services/SUService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// METADATA // {"ai-commented":{"service":"openai-completion","model":"gpt-4o-mini"}}
22
const { get_user } = require("../helpers");
33
const { Context } = require("../util/context");
4-
const { TeePromise } = require("../util/promise");
4+
const { TeePromise } = require('@heyputer/putility').libs.promise;
55
const { Actor, UserActorType } = require("./auth/Actor");
66
const BaseService = require("./BaseService");
77

Diff for: ‎src/backend/src/services/SessionService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1919
*/
2020
const { invalidate_cached_user, get_user } = require("../helpers");
21-
const { asyncSafeSetInterval } = require("../util/promise");
21+
const { asyncSafeSetInterval } = require('@heyputer/putility').libs.promise;
2222
const { MINUTE, SECOND } = require("@heyputer/putility").libs.time;
2323
const BaseService = require("./BaseService");
2424
const { DB_WRITE } = require("./database/consts");

Diff for: ‎src/backend/src/services/abuse-prevention/EdgeRateLimitService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1919
*/
2020
const { Context } = require("../../util/context");
21-
const { asyncSafeSetInterval } = require("../../util/promise");
21+
const { asyncSafeSetInterval } = require('@heyputer/putility').libs.promise;
2222
const { quot } = require('@heyputer/putility').libs.string;
2323

2424
const { MINUTE, HOUR } = require('@heyputer/putility').libs.time;

Diff for: ‎src/backend/src/services/fs/FSLockService.js

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1919
*/
2020
const { RWLock } = require("../../util/lockutil");
21-
const { TeePromise } = require("../../util/promise");
2221
const BaseService = require("../BaseService");
2322

2423
// Constant representing the read lock mode used for distinguishing between read and write operations.

Diff for: ‎src/backend/src/services/runtime-analysis/ServerHealthService.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1919
*/
2020
const BaseService = require("../BaseService");
21-
const { SECOND } = require("@heyputer/putility").libs.time;
21+
const { time, promise } = require("@heyputer/putility").libs;
2222
const { parse_meminfo } = require("../../util/linux");
23-
const { asyncSafeSetInterval, TeePromise } = require("../../util/promise");
2423

2524

2625
/**
@@ -135,19 +134,19 @@ class ServerHealthService extends BaseService {
135134
* @param {none} - No parameters are passed to this method.
136135
* @returns {void}
137136
*/
138-
asyncSafeSetInterval(async () => {
137+
promise.asyncSafeSetInterval(async () => {
139138
this.log.tick('service checks');
140139
const check_failures = [];
141140
for ( const { name, fn, chainable } of this.checks_ ) {
142-
const p_timeout = new TeePromise();
141+
const p_timeout = new promise.TeePromise();
143142
/**
144143
* Creates a TeePromise to handle potential timeouts during health checks.
145144
*
146145
* @returns {Promise} A promise that can be resolved or rejected from multiple places.
147146
*/
148147
const timeout = setTimeout(() => {
149148
p_timeout.reject(new Error('Health check timed out'));
150-
}, 5 * SECOND);
149+
}, 5 * time.SECOND);
151150
try {
152151
await Promise.race([
153152
fn(),
@@ -180,7 +179,7 @@ class ServerHealthService extends BaseService {
180179
}
181180

182181
this.failures_ = check_failures;
183-
}, 10 * SECOND, null, {
182+
}, 10 * time.SECOND, null, {
184183
onBehindSchedule: (drift) => {
185184
svc_alarm.create(
186185
'health-checks-behind-schedule',

Diff for: ‎src/backend/src/services/thumbnails/HTTPThumbnailService.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
const axios = require('axios');
2424

25-
const { TeePromise } = require("../../util/promise");
25+
const { TeePromise } = require('@heyputer/putility').libs.promise;
2626
const { AdvancedBase } = require('@heyputer/putility');
2727
const FormData = require("form-data");
2828
const { stream_to_the_void, buffer_to_stream } = require('../../util/streamutil');

Diff for: ‎src/backend/src/traits/SyncFeature.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* You should have received a copy of the GNU Affero General Public License
1717
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1818
*/
19-
const { Lock } = require("../util/promise");
19+
const { Lock } = require('@heyputer/putility').libs.promise;
2020

2121
class SyncFeature {
2222
constructor (method_include_list) {

Diff for: ‎src/backend/src/util/lockutil.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* You should have received a copy of the GNU Affero General Public License
1717
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1818
*/
19-
const { TeePromise } = require("./promise");
19+
const { TeePromise } = require('@heyputer/putility').libs.promise;
2020

2121
class RWLock {
2222
static TYPE_READ = Symbol('read');

Diff for: ‎src/backend/src/util/otelutil.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
const { context, trace, SpanStatusCode } = require('@opentelemetry/api');
2525
const { Context } = require('./context');
26-
const { TeePromise } = require('./promise');
26+
const { TeePromise } = require('@heyputer/putility').libs.promise;
2727

2828
/*
2929
parallel span example from GPT-4:

0 commit comments

Comments
 (0)