sune-org/ORP
1
0
Fork 0
mirror of https://github.com/sune-org/ORP.git synced 2026-03-17 02:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert: Update index.js

Browse Source
This commit is contained in:
multipleof4
2026-02-17 16:00:48 -08:00
parent 249e7bb99a
commit 9b4f82b72c
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
index.js
View File

@@ -42,14 +42,7 @@ export default {
const id = env.MY_DURABLE_OBJECT.idFromName(uid); const id = env.MY_DURABLE_OBJECT.idFromName(uid);
const stub = env.MY_DURABLE_OBJECT.get(id); const stub = env.MY_DURABLE_OBJECT.get(id);
const cf = req.cf || {}; const resp = await stub.fetch(req);
const locParts = [cf.city, cf.region, cf.country].filter(Boolean);
const location = locParts.length ? locParts.join(', ') : 'Unknown';
const doReq = new Request(req.url, req);
doReq.headers.set('X-Client-Location', location);
const resp = await stub.fetch(doReq);
return isWs ? resp : withCORS(resp); return isWs ? resp : withCORS(resp);
} }
@@ -81,7 +74,6 @@ export class MyDurableObject {
this.hbActive = false; this.hbActive = false;
this.age = 0; this.age = 0;
this.messages = []; this.messages = [];
this.location = 'Unknown';
} }
async resetStorage() { async resetStorage() {
@@ -102,7 +94,7 @@ export class MyDurableObject {
const headers = { Title: 'Sune ORP', Priority: `${pri}`, Tags: tags.join(',') }; const headers = { Title: 'Sune ORP', Priority: `${pri}`, Tags: tags.join(',') };
this.state.waitUntil(fetch(this.env.NTFY_URL, { this.state.waitUntil(fetch(this.env.NTFY_URL, {
method: 'POST', method: 'POST',
body: `${msg}\n📍 ${this.location}`, body: msg,
headers, headers,
}).catch(e => console.error('ntfy failed:', e))); }).catch(e => console.error('ntfy failed:', e)));
} }
@@ -121,7 +113,6 @@ export class MyDurableObject {
this.age = snap.age || 0; this.age = snap.age || 0;
this.phase = snap.phase || 'done'; this.phase = snap.phase || 'done';
this.error = snap.error || null; this.error = snap.error || null;
this.location = snap.location || 'Unknown';
const [msgs, deltaMap] = await Promise.all([ const [msgs, deltaMap] = await Promise.all([
this.state.storage.get('prompt').catch(() => []), this.state.storage.get('prompt').catch(() => []),
@@ -150,7 +141,6 @@ export class MyDurableObject {
age: this.age, age: this.age,
phase: this.phase, phase: this.phase,
error: this.error, error: this.error,
location: this.location,
savedAt: this.lastSavedAt savedAt: this.lastSavedAt
}; };
return this.state.storage.put('run', snapshot).catch(() => {}); return this.state.storage.put('run', snapshot).catch(() => {});
@@ -193,9 +183,6 @@ export class MyDurableObject {
async fetch(req) { async fetch(req) {
if (req.method === 'OPTIONS') return new Response(null, { status: 204, headers: CORS_HEADERS }); if (req.method === 'OPTIONS') return new Response(null, { status: 204, headers: CORS_HEADERS });
const incomingLocation = req.headers.get('X-Client-Location');
if (incomingLocation) this.location = incomingLocation;
if (req.headers.get('Upgrade') === 'websocket') { if (req.headers.get('Upgrade') === 'websocket') {
const [client, server] = Object.values(new WebSocketPair()); const [client, server] = Object.values(new WebSocketPair());
server.accept(); server.accept();
@@ -528,3 +515,5 @@ export class MyDurableObject {
return contents; return contents;
} }
} }